From b565794d4ad978ebdd725470e95f34633ba77d7e Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Mon, 22 Jul 2024 10:32:24 +1200 Subject: [PATCH 1/3] Switch 5.0 BV from uyuni testsuite to spacewalk testsuite --- .../environments/manager-5.0-qe-build-validation-NUE | 4 ++-- .../environments/manager-5.0-qe-build-validation-PRV | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE index 68008f3e1..79823ff2a 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE @@ -25,8 +25,8 @@ node('sumaform-cucumber') { buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), parameters([ - string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/uyuni-project/uyuni.git', description: 'Testsuite Git Repository'), - string(name: 'cucumber_ref', defaultValue: 'master', description: 'Branch prepared for the MU tested'), + string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/SUSE/spacewalk.git', description: 'Testsuite Git Repository'), + string(name: 'cucumber_ref', defaultValue: 'Manager-5.0', description: 'Testsuite Git reference (branch, tag...)'), string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf', description: 'Path to the tf file to be used'), string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'), string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'), diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV index a7a9135e3..c8f2048fd 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV @@ -25,8 +25,8 @@ node('sumaform-cucumber-provo') { buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), parameters([ - string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/uyuni-project/uyuni.git', description: 'Testsuite Git Repository'), - string(name: 'cucumber_ref', defaultValue: 'master', description: 'Branch prepared for the MU tested'), + string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/SUSE/spacewalk.git', description: 'Testsuite Git Repository'), + string(name: 'cucumber_ref', defaultValue: 'Manager-5.0', description: 'Testsuite Git reference (branch, tag...)'), string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf', description: 'Path to the tf file to be used'), string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'), string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'), From 1cff3181dcce7ce8fba036587d4a4949616db67d Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Mon, 22 Jul 2024 12:14:37 +1200 Subject: [PATCH 2/3] Synchronize s390 minion with there x86_64 equivalent. This is to prevent erasing the bootstrap repository. --- .../environments/common/pipeline-build-validation.groovy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy index 70d5c1892..55a40e311 100644 --- a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy +++ b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy @@ -447,6 +447,12 @@ def clientTestingStages() { if (params.confirm_before_continue) { input 'Press any key to start creating bootstrap repositories' } + if (node.contains('s390')){ + def minion_name_without_s390 = node.replaceAll('s390', '') + waitUntil { + bootstrap_repository_status[minion_name_without_s390] != 'NOT_CREATED' + } + } // Employ a lock resource to prevent concurrent calls to create the bootstrap repository in the manager. // Utilize a try-catch mechanism to release the resource for other nodes in the event of a failed bootstrap. lock(resource: mgrCreateBootstrapRepo, timeout: 320) { From 96072bdab4006cd619b30558a99367cbeefa22bc Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Mon, 22 Jul 2024 14:28:48 +1200 Subject: [PATCH 3/3] Remove unrelated changes --- .../environments/common/pipeline-build-validation.groovy | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy index 55a40e311..70d5c1892 100644 --- a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy +++ b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy @@ -447,12 +447,6 @@ def clientTestingStages() { if (params.confirm_before_continue) { input 'Press any key to start creating bootstrap repositories' } - if (node.contains('s390')){ - def minion_name_without_s390 = node.replaceAll('s390', '') - waitUntil { - bootstrap_repository_status[minion_name_without_s390] != 'NOT_CREATED' - } - } // Employ a lock resource to prevent concurrent calls to create the bootstrap repository in the manager. // Utilize a try-catch mechanism to release the resource for other nodes in the event of a failed bootstrap. lock(resource: mgrCreateBootstrapRepo, timeout: 320) {