Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename ssh_minion for sshminion and change nodeHandler behavior. #1359

Closed
wants to merge 2 commits into from
Closed

Rename ssh_minion for sshminion and change nodeHandler behavior. #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0c2e5
Remove ssh_minion mentions
maximenoel8 Sep 12, 2024
759a7ec
Update module name. Replace PR for 5.0 NUE module renaming.
maximenoel8 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions jenkins_pipelines/environments/common/pipeline-build-validation-aws.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,15 +540,15 @@ def clientTestingStages(capybara_timeout, default_timeout, minion_type = 'defaul
tests["${node}"] = {
// Generate a temporary list that comprises of all the minions except the one currently undergoing testing.
// This list is utilized to establish an SSH session exclusively with the minion undergoing testing.
def temporaryList = nodesHandler.envVariableList.toList() - node.replaceAll("ssh_minion", "sshminion").toUpperCase()
def temporaryList = nodesHandler.envVariableList.toList() - node.toUpperCase()
stage("${node}") {
echo "Testing ${node}"
}
stage("Add MUs ${node}") {
if (params.must_add_MU_repositories) {
if (node.contains('ssh_minion')) {
if (node.contains('sshminion')) {
// SSH minion need minion MU channel. This section wait until minion finish creating MU channel
def minion_name_without_ssh = node.replaceAll('ssh_minion', 'minion')
def minion_name_without_ssh = node.replaceAll('sshminion', 'minion')
println "Waiting for the MU channel creation by ${minion_name_without_ssh} for ${node}."
waitUntil {
mu_sync_status[minion_name_without_ssh] != 'UNSYNC'
Expand Down Expand Up @@ -675,11 +675,11 @@ def getNodesHandler(minionType = 'default') {
moduleList.each { lane ->
def nodeName = lane.tokenize(".")[1]
if ( minionType == 'default' && (nodeName.contains('minion') || nodeName.contains('client'))) {
nodeList.add(nodeName.replaceAll('-', '_').replaceAll('sshminion', 'ssh_minion').replaceAll('sles', 'sle'))
nodeList.add(nodeName.replaceAll('-', '_').replaceAll('sles', 'sle'))
envVar.add(nodeName.replaceAll('-', '_').replaceAll('sles', 'sle').toUpperCase())
}
else if (( minionType == 'paygo' && (nodeName.contains('paygo') || nodeName.contains('byos')))) {
nodeList.add(nodeName.replaceAll('-', '_').replaceAll('sshminion', 'ssh_minion').replaceAll('sles', 'sle'))
nodeList.add(nodeName.replaceAll('-', '_').replaceAll('sles', 'sle'))
envVar.add(nodeName.replaceAll('-', '_').replaceAll('sles', 'sle').toUpperCase())
}
}
Expand All @@ -692,7 +692,7 @@ def getNodesHandler(minionType = 'default') {
// This difference will be the nodes to disable
def disabledNodes = nodeList.findAll { !nodesToRun.contains(it) }
// Convert this list to cucumber compatible environment variable
def envVarDisabledNodes = disabledNodes.collect { it.replaceAll('ssh_minion', 'sshminion').toUpperCase() }
def envVarDisabledNodes = disabledNodes.collect { it.toUpperCase() }
// Create a node list without the disabled nodes. ( use to configure the client stage )
def nodeListWithDisabledNodes = nodeList - disabledNodes
// Create a map storing mu synchronization state for each minion.
Expand Down
14 changes: 7 additions & 7 deletions jenkins_pipelines/environments/common/pipeline-build-validation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ def clientTestingStages() {
tests["${node}"] = {
// Generate a temporary list that comprises of all the minions except the one currently undergoing testing.
// This list is utilized to establish an SSH session exclusively with the minion undergoing testing.
def temporaryList = nodesHandler.envVariableList.toList() - node.replaceAll("ssh_minion", "sshminion").toUpperCase()
def temporaryList = nodesHandler.envVariableList.toList() - node.toUpperCase()
stage("${node}") {
echo "Testing ${node}"
}
Expand Down Expand Up @@ -402,10 +402,10 @@ def clientTestingStages() {
stage("Add Activation Keys ${node}") {
// skip this stage for Salt migration minion
if (params.must_add_keys && !node.contains('salt_migration_minion')) {
if (node.contains('ssh_minion')) {
if (node.contains('sshminion')) {
// SSH minion need mandatory custom channel repository. The channel is created during minion stage.
// This section wait until minion creates custom channel.
def minion_name_without_ssh = node.replaceAll('ssh_minion', 'minion')
def minion_name_without_ssh = node.replaceAll('sshminion', 'minion')
println "Waiting for mandatory custom channel for ${node} to be created by ${minion_name_without_ssh}."
waitUntil {
required_custom_channel_status[minion_name_without_ssh] != 'NOT_CREATED'
Expand All @@ -428,10 +428,10 @@ def clientTestingStages() {
}
stage("Create bootstrap repository ${node}") {
if (params.must_create_bootstrap_repos) {
if (node.contains('ssh_minion')) {
if (node.contains('sshminion')) {
// SSH minion need bootstrap repository. The bootstrap repository is created during minion stage.
// This section wait until minion creates bootstrap repository
def minion_name_without_ssh = node.replaceAll('ssh_minion', 'minion')
def minion_name_without_ssh = node.replaceAll('sshminion', 'minion')
println "Waiting for bootstrap repository creation by ${minion_name_without_ssh} for ${node}."
waitUntil {
bootstrap_repository_status[minion_name_without_ssh] != 'NOT_CREATED'
Expand Down Expand Up @@ -518,7 +518,7 @@ def getNodesHandler() {
moduleList.each { lane ->
def instanceList = lane.tokenize(".")
if (instanceList[1].contains('minion') || instanceList[1].contains('client')) {
nodeList.add(instanceList[1].replaceAll('-', '_').replaceAll('sshminion', 'ssh_minion').replaceAll('sles', 'sle'))
nodeList.add(instanceList[1].replaceAll('-', '_').replaceAll('sles', 'sle'))
envVar.add(instanceList[1].replaceAll('-', '_').replaceAll('sles', 'sle').toUpperCase())
}
}
Expand All @@ -531,7 +531,7 @@ def getNodesHandler() {
// This difference will be the nodes to disable
def disabledNodes = nodeList.findAll { !nodesToRun.contains(it) }
// Convert this list to cucumber compatible environment variable
def envVarDisabledNodes = disabledNodes.collect { it.replaceAll('ssh_minion', 'sshminion').toUpperCase() }
def envVarDisabledNodes = disabledNodes.collect { it.toUpperCase() }
// Create a node list without the disabled nodes. ( use to configure the client stage )
def nodeListWithDisabledNodes = nodeList - disabledNodes
// Create a map storing mu synchronization state for each minion.
Expand Down
32 changes: 16 additions & 16 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, sle12sp5_paygo_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_ssh_minion, sle15sp4_byos_minion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_ssh_minion, sle15sp5_paygo_minion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_ssh_minion, sle15sp6_paygo_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_sshminion, sle12sp5_paygo_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_sshminion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_sshminion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_sshminion, sle15sp4_byos_minion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_sshminion, sle15sp5_paygo_minion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_sshminion, sle15sp6_paygo_minion, ' +
'salt_migration_minion, ' +
'alma8_minion, alma8_ssh_minion, alma9_minion, alma9_ssh_minion, ' +
'centos7_client, centos7_minion, centos7_ssh_minion, ' +
'liberty9_minion, liberty9_ssh_minion, ' +
'oracle9_minion, oracle9_ssh_minion, ' +
'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +
'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
'centos7_client, centos7_minion, centos7_sshminion, ' +
'liberty9_minion, liberty9_sshminion, ' +
'oracle9_minion, oracle9_sshminion, ' +
'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ' +
'debian11_minion, debian11_sshminion, debian12_minion, debian12_sshminion, ' +
'opensuse154arm_minion, opensuse154arm_sshminion, ' +
'opensuse155arm_minion, opensuse155arm_sshminion, ' +
'opensuse156arm_minion, opensuse156arm_sshminion, ' +
'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')),
Expand Down
34 changes: 17 additions & 17 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_ssh_minion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_ssh_minion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_ssh_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_sshminion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_sshminion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_sshminion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_sshminion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_sshminion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_sshminion, ' +
'salt_migration_minion, ' +
'alma8_minion, alma8_ssh_minion, alma9_minion, alma9_ssh_minion, ' +
'centos7_client, centos7_minion, centos7_ssh_minion, ' +
'liberty9_minion, liberty9_ssh_minion, ' +
'oracle9_minion, oracle9_ssh_minion, ' +
'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +
'sle15sp5s390_minion, sle15sp5s390_ssh_minion, ' +
'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
'centos7_client, centos7_minion, centos7_sshminion, ' +
'liberty9_minion, liberty9_sshminion, ' +
'oracle9_minion, oracle9_sshminion, ' +
'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ' +
'debian11_minion, debian11_sshminion, debian12_minion, debian12_sshminion, ' +
'opensuse154arm_minion, opensuse154arm_sshminion, ' +
'opensuse155arm_minion, opensuse155arm_sshminion, ' +
'opensuse156arm_minion, opensuse156arm_sshminion, ' +
'sle15sp5s390_minion, sle15sp5s390_sshminion, ' +
'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')),
Expand Down
34 changes: 17 additions & 17 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_ssh_minion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_ssh_minion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_ssh_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_sshminion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_sshminion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_sshminion, ' +
'sle15sp4_client, sle15sp4_minion, sle15sp4_sshminion, ' +
'sle15sp5_client, sle15sp5_minion, sle15sp5_sshminion, ' +
'sle15sp6_client, sle15sp6_minion, sle15sp6_sshminion, ' +
'salt_migration_minion, ' +
'alma8_minion, alma8_ssh_minion, alma9_minion, alma9_ssh_minion, ' +
'centos7_client, centos7_minion, centos7_ssh_minion, ' +
'liberty9_minion, liberty9_ssh_minion, ' +
'oracle9_minion, oracle9_ssh_minion, ' +
'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +
'sle15sp5s390_minion, sle15sp5s390_ssh_minion, ' +
'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
'centos7_client, centos7_minion, centos7_sshminion, ' +
'liberty9_minion, liberty9_sshminion, ' +
'oracle9_minion, oracle9_sshminion, ' +
'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ' +
'debian11_minion, debian11_sshminion, debian12_minion, debian12_sshminion, ' +
'opensuse154arm_minion, opensuse154arm_sshminion, ' +
'opensuse155arm_minion, opensuse155arm_sshminion, ' +
'opensuse156arm_minion, opensuse156arm_sshminion, ' +
'sle15sp5s390_minion, sle15sp5s390_sshminion, ' +
'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')),
Expand Down
34 changes: 17 additions & 17 deletions jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_minion, sle15sp3_ssh_minion, ' +
'sle15sp4_minion, sle15sp4_ssh_minion, ' +
'sle15sp5_minion, sle15sp5_ssh_minion, ' +
'sle15sp6_minion, sle15sp6_ssh_minion, ' +
def minionList = 'sle12sp5_minion, sle12sp5_sshminion, ' +
'sle15sp2_minion, sle15sp2_sshminion, ' +
'sle15sp3_minion, sle15sp3_sshminion, ' +
'sle15sp4_minion, sle15sp4_sshminion, ' +
'sle15sp5_minion, sle15sp5_sshminion, ' +
'sle15sp6_minion, sle15sp6_sshminion, ' +
'salt_migration_minion, ' +
'alma8_minion, alma8_ssh_minion, alma9_minion, alma9_ssh_minion, ' +
'centos7_minion, centos7_ssh_minion, ' +
'liberty9_minion, liberty9_ssh_minion, ' +
'oracle9_minion, oracle9_ssh_minion, ' +
'rocky8_minion, rocky8_ssh_minion, rocky9_minion, rocky9_ssh_minion, ' +
'ubuntu2004_minion, ubuntu2004_ssh_minion, ubuntu2204_minion, ubuntu2204_ssh_minion, ' +
'debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
'opensuse155arm_minion, opensuse155arm_ssh_minion, ' +
'opensuse156arm_minion, opensuse156arm_ssh_minion, ' +
'sle15sp5s390_minion, sle15sp5s390_ssh_minion, ' +
'alma8_minion, alma8_sshminion, alma9_minion, alma9_sshminion, ' +
'centos7_minion, centos7_sshminion, ' +
'liberty9_minion, liberty9_sshminion, ' +
'oracle9_minion, oracle9_sshminion, ' +
'rocky8_minion, rocky8_sshminion, rocky9_minion, rocky9_sshminion, ' +
'ubuntu2004_minion, ubuntu2004_sshminion, ubuntu2204_minion, ubuntu2204_sshminion, ' +
'debian11_minion, debian11_sshminion, debian12_minion, debian12_sshminion, ' +
'opensuse154arm_minion, opensuse154arm_sshminion, ' +
'opensuse155arm_minion, opensuse155arm_sshminion, ' +
'opensuse156arm_minion, opensuse156arm_sshminion, ' +
'sle15sp5s390_minion, sle15sp5s390_sshminion, ' +
'slemicro51_minion, slemicro52_minion, slemicro53_minion, slemicro54_minion, slemicro55_minion, slmicro60_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3')),
Expand Down
Loading