From dec8d619d46711f5edf45c87ed238710b3d922b3 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 17 Jun 2023 08:30:33 +0200 Subject: [PATCH] Revert "build: Temporarily disable Windows guest tests" This reverts commit 83d57d3cce31b6f0750cb5f1fac8d3d311b03db2. Signed-off-by: Anatol Belski --- Jenkinsfile | 92 ++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 391e7e687..4b2988dc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -192,52 +192,52 @@ pipeline { } } } - // stage('Worker build - Windows guest') { - // agent { node { label 'jammy' } } - // when { - // beforeAgent true - // expression { - // return runWorkers - // } - // } - // environment { - // AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b') - // } - // stages { - // stage('Checkout') { - // steps { - // checkout scm - // } - // } - // stage('Install azure-cli') { - // steps { - // installAzureCli('jammy', 'amd64') - // } - // } - // stage('Download assets') { - // steps { - // sh "mkdir ${env.HOME}/workloads" - // sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2022-amd64-2.raw" --name windows-server-2022-amd64-2.raw --connection-string "$AZURE_CONNECTION_STRING"' - // } - // } - // stage('Run Windows guest integration tests') { - // options { - // timeout(time: 1, unit: 'HOURS') - // } - // steps { - // sh 'scripts/dev_cli.sh tests --integration-windows' - // } - // } - // stage('Run Windows guest integration tests for musl') { - // options { - // timeout(time: 1, unit: 'HOURS') - // } - // steps { - // sh 'scripts/dev_cli.sh tests --integration-windows --libc musl' - // } - // } - // } - // } + stage('Worker build - Windows guest') { + agent { node { label 'jammy' } } + when { + beforeAgent true + expression { + return runWorkers + } + } + environment { + AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b') + } + stages { + stage('Checkout') { + steps { + checkout scm + } + } + stage('Install azure-cli') { + steps { + installAzureCli('jammy', 'amd64') + } + } + stage('Download assets') { + steps { + sh "mkdir ${env.HOME}/workloads" + sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2022-amd64-2.raw" --name windows-server-2022-amd64-2.raw --connection-string "$AZURE_CONNECTION_STRING"' + } + } + stage('Run Windows guest integration tests') { + options { + timeout(time: 1, unit: 'HOURS') + } + steps { + sh 'scripts/dev_cli.sh tests --integration-windows' + } + } + stage('Run Windows guest integration tests for musl') { + options { + timeout(time: 1, unit: 'HOURS') + } + steps { + sh 'scripts/dev_cli.sh tests --integration-windows --libc musl' + } + } + } + } stage('Worker build - Metrics') { agent { node { label 'jammy-metrics' } } when {