From 2e0c2e57fabb3a44346bb4c8f26fc35f419803a1 Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Thu, 12 Sep 2024 15:56:10 +0200 Subject: [PATCH 1/2] Remove ssh_minion mentions Replace by sshminion Update nodeHandler to manager this change. --- .../pipeline-build-validation-aws.groovy | 12 +- .../common/pipeline-build-validation.groovy | 14 +-- .../manager-4.3-qe-build-validation-AWS | 32 +++--- .../manager-4.3-qe-build-validation-NUE | 34 +++--- .../manager-4.3-qe-build-validation-PRV | 34 +++--- .../manager-5.0-qe-build-validation-NUE | 34 +++--- .../manager-5.0-qe-build-validation-PRV | 34 +++--- .../uyuni-master-qe-build-validation-NUE | 32 +++--- .../uyuni-master-qe-build-validation-PRV | 32 +++--- .../SUSEManager-4.3-build-validation-AWS.tf | 40 +++---- .../SUSEManager-4.3-build-validation-NUE.tf | 108 +++++++++--------- .../SUSEManager-4.3-build-validation-PRV.tf | 108 +++++++++--------- ...EManager-4.3-build-validation-paygo-AWS.tf | 12 +- .../SUSEManager-5.0-build-validation-PRV.tf | 108 +++++++++--------- .../Uyuni-Master-build-validation-NUE.tf | 104 ++++++++--------- .../Uyuni-Master-build-validation-PRV.tf | 104 ++++++++--------- 16 files changed, 421 insertions(+), 421 deletions(-) diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation-aws.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation-aws.groovy index 4d30aa187..31641db9f 100644 --- a/jenkins_pipelines/environments/common/pipeline-build-validation-aws.groovy +++ b/jenkins_pipelines/environments/common/pipeline-build-validation-aws.groovy @@ -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' @@ -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()) } } @@ -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. diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy index f12083277..34776353c 100644 --- a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy +++ b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy @@ -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}" } @@ -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' @@ -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' @@ -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()) } } @@ -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. diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS index cd20f7fda..6baa28953 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS @@ -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')), diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE index c6f1b57e5..a403772d1 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE @@ -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')), diff --git a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV index 2e72bd92b..c2f62e518 100644 --- a/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV @@ -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')), 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 365519742..57523153b 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE @@ -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')), 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 f85f8e7c5..c11209bdc 100644 --- a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV @@ -1,24 +1,24 @@ #!/usr/bin/env groovy node('sumaform-cucumber-provo') { - 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')), diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE index 8f45f95a9..37c87d96d 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE @@ -1,23 +1,23 @@ #!/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, ' + - '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, ' + + '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')), diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV index f4c797c6a..39c13d25f 100644 --- a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV +++ b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV @@ -1,23 +1,23 @@ #!/usr/bin/env groovy node('sumaform-cucumber-provo') { - 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, ' + - '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, ' + + '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')), diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf index 7f7bf4060..0100f7bda 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf @@ -472,7 +472,7 @@ module "sles15sp6_minion" { } } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -486,7 +486,7 @@ module "ubuntu2004_ssh_minion" { } } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -504,7 +504,7 @@ module "rocky8_ssh_minion" { } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -520,7 +520,7 @@ module "sles12sp5_ssh_minion" { additional_packages = [ "chrony" ] } -module "sles15sp2_ssh_minion" { +module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -534,7 +534,7 @@ module "sles15sp2_ssh_minion" { } } -module "sles15sp3_ssh_minion" { +module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -548,7 +548,7 @@ module "sles15sp3_ssh_minion" { } } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -562,7 +562,7 @@ module "sles15sp4_ssh_minion" { } } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -576,7 +576,7 @@ module "sles15sp5_ssh_minion" { } } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -610,7 +610,7 @@ module "rhel9_minion" { } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -665,44 +665,44 @@ module "controller" { sle12sp5_client_configuration = module.sles12sp5_client.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp2_client_configuration = module.sles15sp2_client.configuration sle15sp2_minion_configuration = module.sles15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration sle15sp3_client_configuration = module.sles15sp3_client.configuration sle15sp3_minion_configuration = module.sles15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration sle15sp4_client_configuration = module.sles15sp4_client.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_client_configuration = module.sles15sp5_client.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration sle15sp6_client_configuration = module.sles15sp6_client.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration // debian11_minion_configuration = module.debian11_minion.configuration -// debian11_sshminion_configuration = module.debian11_ssh_minion.configuration +// debian11_sshminion_configuration = module.debian11_sshminion.configuration // debian12_minion_configuration = module.debian12_minion.configuration -// debian12_sshminion_configuration = module.debian12_ssh_minion.configuration +// debian12_sshminion_configuration = module.debian12_sshminion.configuration rhel9_minion_configuration = module.rhel9_minion.configuration diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf index cafdb2d03..95b418420 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf @@ -947,7 +947,7 @@ module "slmicro60_minion" { install_salt_bundle = false } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -963,7 +963,7 @@ module "sles12sp5_ssh_minion" { gpg_keys = ["default/gpg_keys/galaxy.key"] } -module "sles15sp2_ssh_minion" { +module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -977,7 +977,7 @@ module "sles15sp2_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp3_ssh_minion" { +module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -991,7 +991,7 @@ module "sles15sp3_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1005,7 +1005,7 @@ module "sles15sp4_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1019,7 +1019,7 @@ module "sles15sp5_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1033,7 +1033,7 @@ module "sles15sp6_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "alma8_ssh_minion" { +module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1050,7 +1050,7 @@ module "alma8_ssh_minion" { install_salt_bundle = true } -module "alma9_ssh_minion" { +module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1067,7 +1067,7 @@ module "alma9_ssh_minion" { install_salt_bundle = true } -module "centos7_ssh_minion" { +module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1084,7 +1084,7 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -module "liberty9_ssh_minion" { +module "liberty9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1101,7 +1101,7 @@ module "liberty9_ssh_minion" { install_salt_bundle = true } -module "oracle9_ssh_minion" { +module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1118,7 +1118,7 @@ module "oracle9_ssh_minion" { install_salt_bundle = true } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1135,7 +1135,7 @@ module "rocky8_ssh_minion" { install_salt_bundle = true } -module "rocky9_ssh_minion" { +module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1152,7 +1152,7 @@ module "rocky9_ssh_minion" { install_salt_bundle = true } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1170,7 +1170,7 @@ module "ubuntu2004_ssh_minion" { install_salt_bundle = true } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1184,7 +1184,7 @@ module "ubuntu2204_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian11_ssh_minion" { +module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1198,7 +1198,7 @@ module "debian11_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian12_ssh_minion" { +module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "4.3-released" @@ -1215,7 +1215,7 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1235,7 +1235,7 @@ module "opensuse154arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse155arm_ssh_minion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1255,7 +1255,7 @@ module "opensuse155arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse156arm_ssh_minion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1275,7 +1275,7 @@ module "opensuse156arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5s390_ssh_minion" { +module "sles15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "4.3-released" @@ -1295,7 +1295,7 @@ module "sles15sp5s390_ssh_minion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51_ssh_minion" { +// module "slemicro51_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1310,7 +1310,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52_ssh_minion" { +// module "slemicro52_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1325,7 +1325,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53_ssh_minion" { +// module "slemicro53_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1340,7 +1340,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54_ssh_minion" { +// module "slemicro54_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1355,7 +1355,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55_ssh_minion" { +// module "slemicro55_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1370,7 +1370,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60_ssh_minion" { +// module "slmicro60_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "4.3-released" @@ -1494,99 +1494,99 @@ module "controller" { sle12sp5_client_configuration = module.sles12sp5_client.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp2_client_configuration = module.sles15sp2_client.configuration sle15sp2_minion_configuration = module.sles15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration sle15sp3_client_configuration = module.sles15sp3_client.configuration sle15sp3_minion_configuration = module.sles15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration sle15sp4_client_configuration = module.sles15sp4_client.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_client_configuration = module.sles15sp5_client.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration sle15sp6_client_configuration = module.sles15sp6_client.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration alma8_minion_configuration = module.alma8_minion.configuration - alma8_sshminion_configuration = module.alma8_ssh_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration alma9_minion_configuration = module.alma9_minion.configuration - alma9_sshminion_configuration = module.alma9_ssh_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration centos7_client_configuration = module.centos7_client.configuration centos7_minion_configuration = module.centos7_minion.configuration - centos7_sshminion_configuration = module.centos7_ssh_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration liberty9_minion_configuration = module.liberty9_minion.configuration - liberty9_sshminion_configuration = module.liberty9_ssh_minion.configuration + liberty9_sshminion_configuration = module.liberty9_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration - oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration rocky9_minion_configuration = module.rocky9_minion.configuration - rocky9_sshminion_configuration = module.rocky9_ssh_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration debian11_minion_configuration = module.debian11_minion.configuration - debian11_sshminion_configuration = module.debian11_ssh_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration debian12_minion_configuration = module.debian12_minion.configuration - debian12_sshminion_configuration = module.debian12_ssh_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm_ssh_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration sle15sp5s390_minion_configuration = module.sles15sp5s390_minion.configuration - sle15sp5s390_sshminion_configuration = module.sles15sp5s390_ssh_minion.configuration + sle15sp5s390_sshminion_configuration = module.sles15sp5s390_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51_ssh_minion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52_ssh_minion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53_ssh_minion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54_ssh_minion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55_ssh_minion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60_ssh_minion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf index e27115e9f..cf2b86559 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf @@ -1188,7 +1188,7 @@ module "slmicro60_minion" { install_salt_bundle = false } -module "sle12sp5_ssh_minion" { +module "sle12sp5_sshminion" { providers = { libvirt = libvirt.endor } @@ -1207,7 +1207,7 @@ module "sle12sp5_ssh_minion" { gpg_keys = ["default/gpg_keys/galaxy.key"] } -module "sle15sp2_ssh_minion" { +module "sle15sp2_sshminion" { providers = { libvirt = libvirt.moscowmule } @@ -1224,7 +1224,7 @@ module "sle15sp2_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sle15sp3_ssh_minion" { +module "sle15sp3_sshminion" { providers = { libvirt = libvirt.moscowmule } @@ -1241,7 +1241,7 @@ module "sle15sp3_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sle15sp4_ssh_minion" { +module "sle15sp4_sshminion" { providers = { libvirt = libvirt.moscowmule } @@ -1258,7 +1258,7 @@ module "sle15sp4_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sle15sp5_ssh_minion" { +module "sle15sp5_sshminion" { providers = { libvirt = libvirt.moscowmule } @@ -1275,7 +1275,7 @@ module "sle15sp5_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sle15sp6_ssh_minion" { +module "sle15sp6_sshminion" { providers = { libvirt = libvirt.moscowmule } @@ -1292,7 +1292,7 @@ module "sle15sp6_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "alma8_ssh_minion" { +module "alma8_sshminion" { providers = { libvirt = libvirt.endor } @@ -1312,7 +1312,7 @@ module "alma8_ssh_minion" { install_salt_bundle = true } -module "alma9_ssh_minion" { +module "alma9_sshminion" { providers = { libvirt = libvirt.endor } @@ -1332,7 +1332,7 @@ module "alma9_ssh_minion" { install_salt_bundle = true } -module "centos7_ssh_minion" { +module "centos7_sshminion" { providers = { libvirt = libvirt.endor } @@ -1352,7 +1352,7 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -module "liberty9_ssh_minion" { +module "liberty9_sshminion" { providers = { libvirt = libvirt.endor } @@ -1372,7 +1372,7 @@ module "liberty9_ssh_minion" { install_salt_bundle = true } -module "oracle9_ssh_minion" { +module "oracle9_sshminion" { providers = { libvirt = libvirt.endor } @@ -1392,7 +1392,7 @@ module "oracle9_ssh_minion" { install_salt_bundle = true } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { providers = { libvirt = libvirt.endor } @@ -1412,7 +1412,7 @@ module "rocky8_ssh_minion" { install_salt_bundle = true } -module "rocky9_ssh_minion" { +module "rocky9_sshminion" { providers = { libvirt = libvirt.endor } @@ -1432,7 +1432,7 @@ module "rocky9_ssh_minion" { install_salt_bundle = true } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { providers = { libvirt = libvirt.mandalore } @@ -1453,7 +1453,7 @@ module "ubuntu2004_ssh_minion" { install_salt_bundle = true } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { providers = { libvirt = libvirt.mandalore } @@ -1470,7 +1470,7 @@ module "ubuntu2204_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian11_ssh_minion" { +module "debian11_sshminion" { providers = { libvirt = libvirt.mandalore } @@ -1487,7 +1487,7 @@ module "debian11_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian12_ssh_minion" { +module "debian12_sshminion" { providers = { libvirt = libvirt.mandalore } @@ -1507,7 +1507,7 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1527,7 +1527,7 @@ module "opensuse154arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse155arm_ssh_minion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1547,7 +1547,7 @@ module "opensuse155arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse156arm_ssh_minion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1567,7 +1567,7 @@ module "opensuse156arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sle15sp5s390_ssh_minion" { +module "sle15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "4.3-released" @@ -1587,7 +1587,7 @@ module "sle15sp5s390_ssh_minion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51_ssh_minion" { +// module "slemicro51_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1605,7 +1605,7 @@ module "sle15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52_ssh_minion" { +// module "slemicro52_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1623,7 +1623,7 @@ module "sle15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53_ssh_minion" { +// module "slemicro53_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1641,7 +1641,7 @@ module "sle15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54_ssh_minion" { +// module "slemicro54_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1659,7 +1659,7 @@ module "sle15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55_ssh_minion" { +// module "slemicro55_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1677,7 +1677,7 @@ module "sle15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60_ssh_minion" { +// module "slmicro60_sshminion" { // providers = { // libvirt = libvirt.moscowmule // } @@ -1819,99 +1819,99 @@ module "controller" { sle12sp5_client_configuration = module.sle12sp5_client.configuration sle12sp5_minion_configuration = module.sle12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sle12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sle12sp5_sshminion.configuration sle15sp2_client_configuration = module.sle15sp2_client.configuration sle15sp2_minion_configuration = module.sle15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sle15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sle15sp2_sshminion.configuration sle15sp3_client_configuration = module.sle15sp3_client.configuration sle15sp3_minion_configuration = module.sle15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sle15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sle15sp3_sshminion.configuration sle15sp4_client_configuration = module.sle15sp4_client.configuration sle15sp4_minion_configuration = module.sle15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sle15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sle15sp4_sshminion.configuration sle15sp5_client_configuration = module.sle15sp5_client.configuration sle15sp5_minion_configuration = module.sle15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sle15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sle15sp5_sshminion.configuration sle15sp6_client_configuration = module.sle15sp6_client.configuration sle15sp6_minion_configuration = module.sle15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sle15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sle15sp6_sshminion.configuration alma8_minion_configuration = module.alma8_minion.configuration - alma8_sshminion_configuration = module.alma8_ssh_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration alma9_minion_configuration = module.alma9_minion.configuration - alma9_sshminion_configuration = module.alma9_ssh_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration centos7_client_configuration = module.centos7_client.configuration centos7_minion_configuration = module.centos7_minion.configuration - centos7_sshminion_configuration = module.centos7_ssh_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration liberty9_minion_configuration = module.liberty9_minion.configuration - liberty9_sshminion_configuration = module.liberty9_ssh_minion.configuration + liberty9_sshminion_configuration = module.liberty9_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration - oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration rocky9_minion_configuration = module.rocky9_minion.configuration - rocky9_sshminion_configuration = module.rocky9_ssh_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration debian11_minion_configuration = module.debian11_minion.configuration - debian11_sshminion_configuration = module.debian11_ssh_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration debian12_minion_configuration = module.debian12_minion.configuration - debian12_sshminion_configuration = module.debian12_ssh_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm_ssh_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration sle15sp5s390_minion_configuration = module.sle15sp5s390_minion.configuration - sle15sp5s390_sshminion_configuration = module.sle15sp5s390_ssh_minion.configuration + sle15sp5s390_sshminion_configuration = module.sle15sp5s390_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51_ssh_minion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52_ssh_minion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53_ssh_minion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54_ssh_minion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55_ssh_minion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60_ssh_minion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration sle12sp5_buildhost_configuration = module.sle12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sle15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-paygo-AWS.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-paygo-AWS.tf index 430025009..53d2d6e87 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-paygo-AWS.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-paygo-AWS.tf @@ -409,7 +409,7 @@ module "sles15sp6_minion" { } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -425,7 +425,7 @@ module "sles12sp5_ssh_minion" { additional_packages = [ "chrony" ] } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -440,7 +440,7 @@ module "sles15sp4_ssh_minion" { } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -455,7 +455,7 @@ module "sles15sp5_ssh_minion" { } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration product_version = "4.3-released" @@ -507,11 +507,11 @@ module "controller" { sle12sp5_client_configuration = module.sles12sp5_client.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp4_client_configuration = module.sles15sp4_client.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf index c5758f60c..02b3d6c2b 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -1067,7 +1067,7 @@ module "slmicro60_minion" { install_salt_bundle = false } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1089,7 +1089,7 @@ module "sles12sp5_ssh_minion" { install_salt_bundle = true } -module "sles15sp2_ssh_minion" { +module "sles15sp2_sshminion" { providers = { libvirt = libvirt.florina } @@ -1109,7 +1109,7 @@ module "sles15sp2_ssh_minion" { install_salt_bundle = true } -module "sles15sp3_ssh_minion" { +module "sles15sp3_sshminion" { providers = { libvirt = libvirt.florina } @@ -1129,7 +1129,7 @@ module "sles15sp3_ssh_minion" { install_salt_bundle = true } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { providers = { libvirt = libvirt.florina } @@ -1149,7 +1149,7 @@ module "sles15sp4_ssh_minion" { install_salt_bundle = true } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { providers = { libvirt = libvirt.florina } @@ -1169,7 +1169,7 @@ module "sles15sp5_ssh_minion" { install_salt_bundle = true } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { providers = { libvirt = libvirt.florina } @@ -1189,7 +1189,7 @@ module "sles15sp6_ssh_minion" { install_salt_bundle = true } -module "alma8_ssh_minion" { +module "alma8_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1209,7 +1209,7 @@ module "alma8_ssh_minion" { install_salt_bundle = true } -module "alma9_ssh_minion" { +module "alma9_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1229,7 +1229,7 @@ module "alma9_ssh_minion" { install_salt_bundle = true } -module "centos7_ssh_minion" { +module "centos7_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1249,7 +1249,7 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -module "liberty9_ssh_minion" { +module "liberty9_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1269,7 +1269,7 @@ module "liberty9_ssh_minion" { install_salt_bundle = true } -module "oracle9_ssh_minion" { +module "oracle9_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1289,7 +1289,7 @@ module "oracle9_ssh_minion" { install_salt_bundle = true } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1309,7 +1309,7 @@ module "rocky8_ssh_minion" { install_salt_bundle = true } -module "rocky9_ssh_minion" { +module "rocky9_sshminion" { providers = { libvirt = libvirt.tatooine } @@ -1329,7 +1329,7 @@ module "rocky9_ssh_minion" { install_salt_bundle = true } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { providers = { libvirt = libvirt.trantor } @@ -1350,7 +1350,7 @@ module "ubuntu2004_ssh_minion" { install_salt_bundle = true } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { providers = { libvirt = libvirt.trantor } @@ -1370,7 +1370,7 @@ module "ubuntu2204_ssh_minion" { install_salt_bundle = true } -module "debian11_ssh_minion" { +module "debian11_sshminion" { providers = { libvirt = libvirt.trantor } @@ -1390,7 +1390,7 @@ module "debian11_ssh_minion" { install_salt_bundle = true } -module "debian12_ssh_minion" { +module "debian12_sshminion" { providers = { libvirt = libvirt.trantor } @@ -1410,7 +1410,7 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1433,7 +1433,7 @@ module "opensuse154arm_ssh_minion" { install_salt_bundle = true } -module "opensuse155arm_ssh_minion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1456,7 +1456,7 @@ module "opensuse155arm_ssh_minion" { install_salt_bundle = true } -module "opensuse156arm_ssh_minion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1479,7 +1479,7 @@ module "opensuse156arm_ssh_minion" { install_salt_bundle = true } -module "sles15sp5s390_ssh_minion" { +module "sles15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "5.0-released" @@ -1502,7 +1502,7 @@ module "sles15sp5s390_ssh_minion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51_ssh_minion" { +// module "slemicro51_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1523,7 +1523,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52_ssh_minion" { +// module "slemicro52_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1544,7 +1544,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53_ssh_minion" { +// module "slemicro53_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1565,7 +1565,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54_ssh_minion" { +// module "slemicro54_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1586,7 +1586,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55_ssh_minion" { +// module "slemicro55_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1607,7 +1607,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60_ssh_minion" { +// module "slmicro60_sshminion" { // providers = { // libvirt = libvirt.florina // } @@ -1777,93 +1777,93 @@ module "controller" { proxy_configuration = module.proxy_containerized.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp2_minion_configuration = module.sles15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration sle15sp3_minion_configuration = module.sles15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration alma8_minion_configuration = module.alma8_minion.configuration - alma8_sshminion_configuration = module.alma8_ssh_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration alma9_minion_configuration = module.alma9_minion.configuration - alma9_sshminion_configuration = module.alma9_ssh_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration centos7_minion_configuration = module.centos7_minion.configuration - centos7_sshminion_configuration = module.centos7_ssh_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration liberty9_minion_configuration = module.liberty9_minion.configuration - liberty9_sshminion_configuration = module.liberty9_ssh_minion.configuration + liberty9_sshminion_configuration = module.liberty9_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration - oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration rocky9_minion_configuration = module.rocky9_minion.configuration - rocky9_sshminion_configuration = module.rocky9_ssh_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration debian11_minion_configuration = module.debian11_minion.configuration - debian11_sshminion_configuration = module.debian11_ssh_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration debian12_minion_configuration = module.debian12_minion.configuration - debian12_sshminion_configuration = module.debian12_ssh_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm_ssh_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration sle15sp5s390_minion_configuration = module.sles15sp5s390_minion.configuration - sle15sp5s390_sshminion_configuration = module.sles15sp5s390_ssh_minion.configuration + sle15sp5s390_sshminion_configuration = module.sles15sp5s390_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51_ssh_minion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52_ssh_minion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53_ssh_minion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54_ssh_minion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55_ssh_minion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60_ssh_minion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf index 5b5f9f0af..5ec96f84f 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -794,7 +794,7 @@ module "slmicro60_minion" { install_salt_bundle = false } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -810,7 +810,7 @@ module "sles12sp5_ssh_minion" { gpg_keys = ["default/gpg_keys/galaxy.key"] } -module "sles15sp2_ssh_minion" { +module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -824,7 +824,7 @@ module "sles15sp2_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp3_ssh_minion" { +module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -838,7 +838,7 @@ module "sles15sp3_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -852,7 +852,7 @@ module "sles15sp4_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -866,7 +866,7 @@ module "sles15sp5_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -880,7 +880,7 @@ module "sles15sp6_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "alma8_ssh_minion" { +module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -897,7 +897,7 @@ module "alma8_ssh_minion" { install_salt_bundle = true } -module "alma9_ssh_minion" { +module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -914,7 +914,7 @@ module "alma9_ssh_minion" { install_salt_bundle = true } -module "centos7_ssh_minion" { +module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -931,7 +931,7 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -module "oracle9_ssh_minion" { +module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -948,7 +948,7 @@ module "oracle9_ssh_minion" { install_salt_bundle = true } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -965,7 +965,7 @@ module "rocky8_ssh_minion" { install_salt_bundle = true } -module "rocky9_ssh_minion" { +module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -982,7 +982,7 @@ module "rocky9_ssh_minion" { install_salt_bundle = true } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -1000,7 +1000,7 @@ module "ubuntu2004_ssh_minion" { install_salt_bundle = true } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -1014,7 +1014,7 @@ module "ubuntu2204_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian11_ssh_minion" { +module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -1028,7 +1028,7 @@ module "debian11_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian12_ssh_minion" { +module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" @@ -1045,7 +1045,7 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1065,7 +1065,7 @@ module "opensuse154arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse155arm_ssh_minion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1085,7 +1085,7 @@ module "opensuse155arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse156arm_ssh_minion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1105,7 +1105,7 @@ module "opensuse156arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5s390_ssh_minion" { +module "sles15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "uyuni-master" @@ -1125,7 +1125,7 @@ module "sles15sp5s390_ssh_minion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51_ssh_minion" { +// module "slemicro51_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1140,7 +1140,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52_ssh_minion" { +// module "slemicro52_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1155,7 +1155,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53_ssh_minion" { +// module "slemicro53_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1170,7 +1170,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54_ssh_minion" { +// module "slemicro54_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1185,7 +1185,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55_ssh_minion" { +// module "slemicro55_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1200,7 +1200,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60_ssh_minion" { +// module "slmicro60_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" @@ -1323,90 +1323,90 @@ module "controller" { proxy_configuration = module.proxy_containerized.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp2_minion_configuration = module.sles15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration sle15sp3_minion_configuration = module.sles15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration alma8_minion_configuration = module.alma8_minion.configuration - alma8_sshminion_configuration = module.alma8_ssh_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration alma9_minion_configuration = module.alma9_minion.configuration - alma9_sshminion_configuration = module.alma9_ssh_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration centos7_minion_configuration = module.centos7_minion.configuration - centos7_sshminion_configuration = module.centos7_ssh_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration - oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration rocky9_minion_configuration = module.rocky9_minion.configuration - rocky9_sshminion_configuration = module.rocky9_ssh_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration debian11_minion_configuration = module.debian11_minion.configuration - debian11_sshminion_configuration = module.debian11_ssh_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration debian12_minion_configuration = module.debian12_minion.configuration - debian12_sshminion_configuration = module.debian12_ssh_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm_ssh_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration sle15sp5s390_minion_configuration = module.sles15sp5s390_minion.configuration - sle15sp5s390_sshminion_configuration = module.sles15sp5s390_ssh_minion.configuration + sle15sp5s390_sshminion_configuration = module.sles15sp5s390_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51_ssh_minion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52_ssh_minion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53_ssh_minion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54_ssh_minion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55_ssh_minion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60_ssh_minion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf index d5ad7a81c..b1b005e73 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -1009,7 +1009,7 @@ module "slmicro60_minion" { install_salt_bundle = false } -module "sles12sp5_ssh_minion" { +module "sles12sp5_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1028,7 +1028,7 @@ module "sles12sp5_ssh_minion" { gpg_keys = ["default/gpg_keys/galaxy.key"] } -module "sles15sp2_ssh_minion" { +module "sles15sp2_sshminion" { providers = { libvirt = libvirt.ginfizz } @@ -1045,7 +1045,7 @@ module "sles15sp2_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp3_ssh_minion" { +module "sles15sp3_sshminion" { providers = { libvirt = libvirt.ginfizz } @@ -1062,7 +1062,7 @@ module "sles15sp3_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp4_ssh_minion" { +module "sles15sp4_sshminion" { providers = { libvirt = libvirt.ginfizz } @@ -1079,7 +1079,7 @@ module "sles15sp4_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5_ssh_minion" { +module "sles15sp5_sshminion" { providers = { libvirt = libvirt.ginfizz } @@ -1096,7 +1096,7 @@ module "sles15sp5_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp6_ssh_minion" { +module "sles15sp6_sshminion" { providers = { libvirt = libvirt.ginfizz } @@ -1113,7 +1113,7 @@ module "sles15sp6_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "alma8_ssh_minion" { +module "alma8_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1133,7 +1133,7 @@ module "alma8_ssh_minion" { install_salt_bundle = true } -module "alma9_ssh_minion" { +module "alma9_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1153,7 +1153,7 @@ module "alma9_ssh_minion" { install_salt_bundle = true } -module "centos7_ssh_minion" { +module "centos7_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1173,7 +1173,7 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -module "oracle9_ssh_minion" { +module "oracle9_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1193,7 +1193,7 @@ module "oracle9_ssh_minion" { install_salt_bundle = true } -module "rocky8_ssh_minion" { +module "rocky8_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1213,7 +1213,7 @@ module "rocky8_ssh_minion" { install_salt_bundle = true } -module "rocky9_ssh_minion" { +module "rocky9_sshminion" { providers = { libvirt = libvirt.cosmopolitan } @@ -1233,7 +1233,7 @@ module "rocky9_ssh_minion" { install_salt_bundle = true } -module "ubuntu2004_ssh_minion" { +module "ubuntu2004_sshminion" { providers = { libvirt = libvirt.caipirinha } @@ -1254,7 +1254,7 @@ module "ubuntu2004_ssh_minion" { install_salt_bundle = true } -module "ubuntu2204_ssh_minion" { +module "ubuntu2204_sshminion" { providers = { libvirt = libvirt.caipirinha } @@ -1271,7 +1271,7 @@ module "ubuntu2204_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian11_ssh_minion" { +module "debian11_sshminion" { providers = { libvirt = libvirt.caipirinha } @@ -1288,7 +1288,7 @@ module "debian11_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "debian12_ssh_minion" { +module "debian12_sshminion" { providers = { libvirt = libvirt.caipirinha } @@ -1308,7 +1308,7 @@ module "debian12_ssh_minion" { install_salt_bundle = true } -module "opensuse154arm_ssh_minion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1328,7 +1328,7 @@ module "opensuse154arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse155arm_ssh_minion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1348,7 +1348,7 @@ module "opensuse155arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "opensuse156arm_ssh_minion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1368,7 +1368,7 @@ module "opensuse156arm_ssh_minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles15sp5s390_ssh_minion" { +module "sles15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "uyuni-master" @@ -1388,7 +1388,7 @@ module "sles15sp5s390_ssh_minion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51_ssh_minion" { +// module "slemicro51_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1406,7 +1406,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52_ssh_minion" { +// module "slemicro52_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1424,7 +1424,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53_ssh_minion" { +// module "slemicro53_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1442,7 +1442,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54_ssh_minion" { +// module "slemicro54_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1460,7 +1460,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55_ssh_minion" { +// module "slemicro55_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1478,7 +1478,7 @@ module "sles15sp5s390_ssh_minion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60_ssh_minion" { +// module "slmicro60_sshminion" { // providers = { // libvirt = libvirt.ginfizz // } @@ -1618,90 +1618,90 @@ module "controller" { proxy_configuration = module.proxy_containerized.configuration sle12sp5_minion_configuration = module.sles12sp5_minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5_ssh_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration sle15sp2_minion_configuration = module.sles15sp2_minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2_ssh_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration sle15sp3_minion_configuration = module.sles15sp3_minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3_ssh_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration sle15sp4_minion_configuration = module.sles15sp4_minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4_ssh_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration sle15sp5_minion_configuration = module.sles15sp5_minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5_ssh_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration sle15sp6_minion_configuration = module.sles15sp6_minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6_ssh_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration alma8_minion_configuration = module.alma8_minion.configuration - alma8_sshminion_configuration = module.alma8_ssh_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration alma9_minion_configuration = module.alma9_minion.configuration - alma9_sshminion_configuration = module.alma9_ssh_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration centos7_minion_configuration = module.centos7_minion.configuration - centos7_sshminion_configuration = module.centos7_ssh_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration - oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration rocky8_minion_configuration = module.rocky8_minion.configuration - rocky8_sshminion_configuration = module.rocky8_ssh_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration rocky9_minion_configuration = module.rocky9_minion.configuration - rocky9_sshminion_configuration = module.rocky9_ssh_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004_ssh_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204_ssh_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration debian11_minion_configuration = module.debian11_minion.configuration - debian11_sshminion_configuration = module.debian11_ssh_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration debian12_minion_configuration = module.debian12_minion.configuration - debian12_sshminion_configuration = module.debian12_ssh_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm_ssh_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm_ssh_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm_ssh_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration sle15sp5s390_minion_configuration = module.sles15sp5s390_minion.configuration - sle15sp5s390_sshminion_configuration = module.sles15sp5s390_ssh_minion.configuration + sle15sp5s390_sshminion_configuration = module.sles15sp5s390_sshminion.configuration salt_migration_minion_configuration = module.salt_migration_minion.configuration slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51_ssh_minion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52_ssh_minion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53_ssh_minion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54_ssh_minion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55_ssh_minion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60_ssh_minion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration From 759a7ec8c25f665f6ab3e3d40e200f43dfc24fad Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Mon, 16 Sep 2024 08:46:52 +0200 Subject: [PATCH 2/2] Update module name. Replace PR for 5.0 NUE module renaming. --- .../SUSEManager-5.0-build-validation-NUE.tf | 246 +++++++++--------- 1 file changed, 123 insertions(+), 123 deletions(-) diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf index c71f2ef7b..1d6629c3d 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf @@ -220,7 +220,7 @@ module "proxy_containerized" { ssh_key_path = "./salt/controller/id_rsa.pub" } -module "sles12sp5-minion" { +module "sles12sp5_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -241,7 +241,7 @@ module "sles12sp5-minion" { install_salt_bundle = true } -module "sles15sp2-minion" { +module "sles15sp2_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -263,7 +263,7 @@ module "sles15sp2-minion" { install_salt_bundle = true } -module "sles15sp3-minion" { +module "sles15sp3_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -285,7 +285,7 @@ module "sles15sp3-minion" { install_salt_bundle = true } -module "sles15sp4-minion" { +module "sles15sp4_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -307,7 +307,7 @@ module "sles15sp4-minion" { install_salt_bundle = true } -module "sles15sp5-minion" { +module "sles15sp5_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -329,7 +329,7 @@ module "sles15sp5-minion" { install_salt_bundle = true } -module "sles15sp6-minion" { +module "sles15sp6_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -351,7 +351,7 @@ module "sles15sp6-minion" { install_salt_bundle = true } -module "alma8-minion" { +module "alma8_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -372,7 +372,7 @@ module "alma8-minion" { install_salt_bundle = true } -module "alma9-minion" { +module "alma9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -393,7 +393,7 @@ module "alma9-minion" { install_salt_bundle = true } -module "centos7-minion" { +module "centos7_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -414,7 +414,7 @@ module "centos7-minion" { install_salt_bundle = true } -module "liberty9-minion" { +module "liberty9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -435,7 +435,7 @@ module "liberty9-minion" { install_salt_bundle = true } -module "oracle9-minion" { +module "oracle9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -456,7 +456,7 @@ module "oracle9-minion" { install_salt_bundle = true } -module "rocky8-minion" { +module "rocky8_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -477,7 +477,7 @@ module "rocky8-minion" { install_salt_bundle = true } -module "rocky9-minion" { +module "rocky9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -498,7 +498,7 @@ module "rocky9-minion" { install_salt_bundle = true } -module "ubuntu2004-minion" { +module "ubuntu2004_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -520,7 +520,7 @@ module "ubuntu2004-minion" { install_salt_bundle = true } -module "ubuntu2204-minion" { +module "ubuntu2204_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -541,7 +541,7 @@ module "ubuntu2204-minion" { install_salt_bundle = true } -module "debian11-minion" { +module "debian11_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -563,7 +563,7 @@ module "debian11-minion" { install_salt_bundle = true } -module "debian12-minion" { +module "debian12_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -585,7 +585,7 @@ module "debian12-minion" { install_salt_bundle = true } -module "opensuse154arm-minion" { +module "opensuse154arm_minion" { providers = { libvirt = libvirt.suma-arm } @@ -612,7 +612,7 @@ module "opensuse154arm-minion" { install_salt_bundle = true } -module "opensuse155arm-minion" { +module "opensuse155arm_minion" { providers = { libvirt = libvirt.suma-arm } @@ -639,7 +639,7 @@ module "opensuse155arm-minion" { install_salt_bundle = true } -module "opensuse156arm-minion" { +module "opensuse156arm_minion" { providers = { libvirt = libvirt.suma-arm } @@ -666,7 +666,7 @@ module "opensuse156arm-minion" { install_salt_bundle = true } -module "sles15sp5s390-minion" { +module "sles15sp5s390_minion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "5.0-released" @@ -689,7 +689,7 @@ module "sles15sp5s390-minion" { } // This is an x86_64 SLES 15 SP5 minion (like sles15sp5-minion), // dedicated to testing migration from OS Salt to Salt bundle -module "salt-migration-minion" { +module "salt_migration_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration name = "min-salt-migration" @@ -709,7 +709,7 @@ module "salt-migration-minion" { install_salt_bundle = false } -module "slemicro51-minion" { +module "slemicro51_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -732,7 +732,7 @@ module "slemicro51-minion" { install_salt_bundle = false } -module "slemicro52-minion" { +module "slemicro52_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -755,7 +755,7 @@ module "slemicro52-minion" { install_salt_bundle = false } -module "slemicro53-minion" { +module "slemicro53_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -778,7 +778,7 @@ module "slemicro53-minion" { install_salt_bundle = false } -module "slemicro54-minion" { +module "slemicro54_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -801,7 +801,7 @@ module "slemicro54-minion" { install_salt_bundle = false } -module "slemicro55-minion" { +module "slemicro55_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -824,7 +824,7 @@ module "slemicro55-minion" { install_salt_bundle = false } -module "slmicro60-minion" { +module "slmicro60_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -848,7 +848,7 @@ module "slmicro60-minion" { install_salt_bundle = false } -module "sles12sp5-sshminion" { +module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -867,7 +867,7 @@ module "sles12sp5-sshminion" { install_salt_bundle = true } -module "sles15sp2-sshminion" { +module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -884,7 +884,7 @@ module "sles15sp2-sshminion" { install_salt_bundle = true } -module "sles15sp3-sshminion" { +module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -901,7 +901,7 @@ module "sles15sp3-sshminion" { install_salt_bundle = true } -module "sles15sp4-sshminion" { +module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -918,7 +918,7 @@ module "sles15sp4-sshminion" { install_salt_bundle = true } -module "sles15sp5-sshminion" { +module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -935,7 +935,7 @@ module "sles15sp5-sshminion" { install_salt_bundle = true } -module "sles15sp6-sshminion" { +module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -952,7 +952,7 @@ module "sles15sp6-sshminion" { install_salt_bundle = true } -module "alma8-sshminion" { +module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -969,7 +969,7 @@ module "alma8-sshminion" { install_salt_bundle = true } -module "alma9-sshminion" { +module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -986,7 +986,7 @@ module "alma9-sshminion" { install_salt_bundle = true } -module "centos7-sshminion" { +module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1004,7 +1004,7 @@ module "centos7-sshminion" { } -module "liberty9-sshminion" { +module "liberty9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1021,7 +1021,7 @@ module "liberty9-sshminion" { install_salt_bundle = true } -module "oracle9-sshminion" { +module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1038,7 +1038,7 @@ module "oracle9-sshminion" { install_salt_bundle = true } -module "rocky8-sshminion" { +module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1055,7 +1055,7 @@ module "rocky8-sshminion" { install_salt_bundle = true } -module "rocky9-sshminion" { +module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1072,7 +1072,7 @@ module "rocky9-sshminion" { install_salt_bundle = true } -module "ubuntu2004-sshminion" { +module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1090,7 +1090,7 @@ module "ubuntu2004-sshminion" { install_salt_bundle = true } -module "ubuntu2204-sshminion" { +module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1107,7 +1107,7 @@ module "ubuntu2204-sshminion" { install_salt_bundle = true } -module "debian11-sshminion" { +module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1124,7 +1124,7 @@ module "debian11-sshminion" { install_salt_bundle = true } -module "debian12-sshminion" { +module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1141,7 +1141,7 @@ module "debian12-sshminion" { install_salt_bundle = true } -module "opensuse154arm-sshminion" { +module "opensuse154arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1164,7 +1164,7 @@ module "opensuse154arm-sshminion" { install_salt_bundle = true } -module "opensuse155arm-sshminion" { +module "opensuse155arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1187,7 +1187,7 @@ module "opensuse155arm-sshminion" { install_salt_bundle = true } -module "opensuse156arm-sshminion" { +module "opensuse156arm_sshminion" { providers = { libvirt = libvirt.suma-arm } @@ -1210,7 +1210,7 @@ module "opensuse156arm-sshminion" { install_salt_bundle = true } -module "sles15sp5s390-sshminion" { +module "sles15sp5s390_sshminion" { source = "./backend_modules/feilong/host" base_configuration = module.base_s390.configuration product_version = "5.0-released" @@ -1233,7 +1233,7 @@ module "sles15sp5s390-sshminion" { } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro51-sshminion" { +// module "slemicro51_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1251,7 +1251,7 @@ module "sles15sp5s390-sshminion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro52-sshminion" { +// module "slemicro52_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1269,7 +1269,7 @@ module "sles15sp5s390-sshminion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro53-sshminion" { +// module "slemicro53_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1287,7 +1287,7 @@ module "sles15sp5s390-sshminion" { // } // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro54-sshminion" { +// module "slemicro54_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1305,7 +1305,7 @@ module "sles15sp5s390-sshminion" { //} // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slemicro55-sshminion" { +// module "slemicro55_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1322,7 +1322,7 @@ module "sles15sp5s390-sshminion" { //} // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// module "slmicro60-sshminion" { +// module "slmicro60_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "5.0-released" @@ -1338,7 +1338,7 @@ module "sles15sp5s390-sshminion" { // install_salt_bundle = true //} -module "sles12sp5-buildhost" { +module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1360,7 +1360,7 @@ module "sles12sp5-buildhost" { install_salt_bundle = true } -module "sles12sp5-terminal" { +module "sles12sp5_terminal" { source = "./modules/pxe_boot" base_configuration = module.base_core.configuration name = "terminal-sles12sp5" @@ -1375,7 +1375,7 @@ module "sles12sp5-terminal" { private_name = "sle12sp5terminal" } -module "sles15sp4-buildhost" { +module "sles15sp4_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1397,7 +1397,7 @@ module "sles15sp4-buildhost" { install_salt_bundle = true } -module "sles15sp4-terminal" { +module "sles15sp4_terminal" { source = "./modules/pxe_boot" base_configuration = module.base_core.configuration name = "terminal-sles15sp4" @@ -1412,15 +1412,15 @@ module "sles15sp4-terminal" { private_name = "sle15sp4terminal" } -module "dhcp-dns" { +module "dhcp_dns" { source = "./modules/dhcp_dns" base_configuration = module.base_core.configuration name = "dhcp-dns" image = "opensuse155o" private_hosts = [ module.proxy_containerized.configuration, - module.sles12sp5-terminal.configuration, - module.sles15sp4-terminal.configuration + module.sles12sp5_terminal.configuration, + module.sles15sp4_terminal.configuration ] hypervisor = { host = "suma-06.mgr.suse.de" @@ -1429,7 +1429,7 @@ module "dhcp-dns" { } } -module "monitoring-server" { +module "monitoring_server" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "5.0-released" @@ -1472,102 +1472,102 @@ module "controller" { proxy_configuration = module.proxy_containerized.configuration - sle12sp5_minion_configuration = module.sles12sp5-minion.configuration - sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration + sle12sp5_minion_configuration = module.sles12sp5_minion.configuration + sle12sp5_sshminion_configuration = module.sles12sp5_sshminion.configuration - sle15sp2_minion_configuration = module.sles15sp2-minion.configuration - sle15sp2_sshminion_configuration = module.sles15sp2-sshminion.configuration + sle15sp2_minion_configuration = module.sles15sp2_minion.configuration + sle15sp2_sshminion_configuration = module.sles15sp2_sshminion.configuration - sle15sp3_minion_configuration = module.sles15sp3-minion.configuration - sle15sp3_sshminion_configuration = module.sles15sp3-sshminion.configuration + sle15sp3_minion_configuration = module.sles15sp3_minion.configuration + sle15sp3_sshminion_configuration = module.sles15sp3_sshminion.configuration - sle15sp4_minion_configuration = module.sles15sp4-minion.configuration - sle15sp4_sshminion_configuration = module.sles15sp4-sshminion.configuration + sle15sp4_minion_configuration = module.sles15sp4_minion.configuration + sle15sp4_sshminion_configuration = module.sles15sp4_sshminion.configuration - sle15sp5_minion_configuration = module.sles15sp5-minion.configuration - sle15sp5_sshminion_configuration = module.sles15sp5-sshminion.configuration + sle15sp5_minion_configuration = module.sles15sp5_minion.configuration + sle15sp5_sshminion_configuration = module.sles15sp5_sshminion.configuration - sle15sp6_minion_configuration = module.sles15sp6-minion.configuration - sle15sp6_sshminion_configuration = module.sles15sp6-sshminion.configuration + sle15sp6_minion_configuration = module.sles15sp6_minion.configuration + sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration - alma8_minion_configuration = module.alma8-minion.configuration - alma8_sshminion_configuration = module.alma8-sshminion.configuration + alma8_minion_configuration = module.alma8_minion.configuration + alma8_sshminion_configuration = module.alma8_sshminion.configuration - alma9_minion_configuration = module.alma9-minion.configuration - alma9_sshminion_configuration = module.alma9-sshminion.configuration + alma9_minion_configuration = module.alma9_minion.configuration + alma9_sshminion_configuration = module.alma9_sshminion.configuration - centos7_minion_configuration = module.centos7-minion.configuration - centos7_sshminion_configuration = module.centos7-sshminion.configuration + centos7_minion_configuration = module.centos7_minion.configuration + centos7_sshminion_configuration = module.centos7_sshminion.configuration - liberty9_minion_configuration = module.liberty9-minion.configuration - liberty9_sshminion_configuration = module.liberty9-sshminion.configuration + liberty9_minion_configuration = module.liberty9_minion.configuration + liberty9_sshminion_configuration = module.liberty9_sshminion.configuration - oracle9_minion_configuration = module.oracle9-minion.configuration - oracle9_sshminion_configuration = module.oracle9-sshminion.configuration + oracle9_minion_configuration = module.oracle9_minion.configuration + oracle9_sshminion_configuration = module.oracle9_sshminion.configuration - rocky8_minion_configuration = module.rocky8-minion.configuration - rocky8_sshminion_configuration = module.rocky8-sshminion.configuration + rocky8_minion_configuration = module.rocky8_minion.configuration + rocky8_sshminion_configuration = module.rocky8_sshminion.configuration - rocky9_minion_configuration = module.rocky9-minion.configuration - rocky9_sshminion_configuration = module.rocky9-sshminion.configuration + rocky9_minion_configuration = module.rocky9_minion.configuration + rocky9_sshminion_configuration = module.rocky9_sshminion.configuration - ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration - ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration + ubuntu2004_minion_configuration = module.ubuntu2004_minion.configuration + ubuntu2004_sshminion_configuration = module.ubuntu2004_sshminion.configuration - ubuntu2204_minion_configuration = module.ubuntu2204-minion.configuration - ubuntu2204_sshminion_configuration = module.ubuntu2204-sshminion.configuration + ubuntu2204_minion_configuration = module.ubuntu2204_minion.configuration + ubuntu2204_sshminion_configuration = module.ubuntu2204_sshminion.configuration - debian11_minion_configuration = module.debian11-minion.configuration - debian11_sshminion_configuration = module.debian11-sshminion.configuration + debian11_minion_configuration = module.debian11_minion.configuration + debian11_sshminion_configuration = module.debian11_sshminion.configuration - debian12_minion_configuration = module.debian12-minion.configuration - debian12_sshminion_configuration = module.debian12-sshminion.configuration + debian12_minion_configuration = module.debian12_minion.configuration + debian12_sshminion_configuration = module.debian12_sshminion.configuration - opensuse154arm_minion_configuration = module.opensuse154arm-minion.configuration - opensuse154arm_sshminion_configuration = module.opensuse154arm-sshminion.configuration + opensuse154arm_minion_configuration = module.opensuse154arm_minion.configuration + opensuse154arm_sshminion_configuration = module.opensuse154arm_sshminion.configuration - opensuse155arm_minion_configuration = module.opensuse155arm-minion.configuration - opensuse155arm_sshminion_configuration = module.opensuse155arm-sshminion.configuration + opensuse155arm_minion_configuration = module.opensuse155arm_minion.configuration + opensuse155arm_sshminion_configuration = module.opensuse155arm_sshminion.configuration - opensuse156arm_minion_configuration = module.opensuse156arm-minion.configuration - opensuse156arm_sshminion_configuration = module.opensuse156arm-sshminion.configuration + opensuse156arm_minion_configuration = module.opensuse156arm_minion.configuration + opensuse156arm_sshminion_configuration = module.opensuse156arm_sshminion.configuration - sle15sp5s390_minion_configuration = module.sles15sp5s390-minion.configuration - sle15sp5s390_sshminion_configuration = module.sles15sp5s390-sshminion.configuration + sle15sp5s390_minion_configuration = module.sles15sp5s390_minion.configuration + sle15sp5s390_sshminion_configuration = module.sles15sp5s390_sshminion.configuration - salt_migration_minion_configuration = module.salt-migration-minion.configuration + salt_migration_minion_configuration = module.salt_migration_minion.configuration - slemicro51_minion_configuration = module.slemicro51-minion.configuration + slemicro51_minion_configuration = module.slemicro51_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro51_sshminion_configuration = module.slemicro51-sshminion.configuration +// slemicro51_sshminion_configuration = module.slemicro51_sshminion.configuration - slemicro52_minion_configuration = module.slemicro52-minion.configuration + slemicro52_minion_configuration = module.slemicro52_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro52_sshminion_configuration = module.slemicro52-sshminion.configuration +// slemicro52_sshminion_configuration = module.slemicro52_sshminion.configuration - slemicro53_minion_configuration = module.slemicro53-minion.configuration + slemicro53_minion_configuration = module.slemicro53_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro53_sshminion_configuration = module.slemicro53-sshminion.configuration +// slemicro53_sshminion_configuration = module.slemicro53_sshminion.configuration - slemicro54_minion_configuration = module.slemicro54-minion.configuration + slemicro54_minion_configuration = module.slemicro54_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro54_sshminion_configuration = module.slemicro54-sshminion.configuration +// slemicro54_sshminion_configuration = module.slemicro54_sshminion.configuration - slemicro55_minion_configuration = module.slemicro55-minion.configuration + slemicro55_minion_configuration = module.slemicro55_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slemicro55_sshminion_configuration = module.slemicro55-sshminion.configuration +// slemicro55_sshminion_configuration = module.slemicro55_sshminion.configuration - slmicro60_minion_configuration = module.slmicro60-minion.configuration + slmicro60_minion_configuration = module.slmicro60_minion.configuration // WORKAROUND until https://bugzilla.suse.com/show_bug.cgi?id=1208045 gets fixed -// slmicro60_sshminion_configuration = module.slmicro60-sshminion.configuration +// slmicro60_sshminion_configuration = module.slmicro60_sshminion.configuration - sle12sp5_buildhost_configuration = module.sles12sp5-buildhost.configuration - sle15sp4_buildhost_configuration = module.sles15sp4-buildhost.configuration + sle12sp5_buildhost_configuration = module.sles12sp5_buildhost.configuration + sle15sp4_buildhost_configuration = module.sles15sp4_buildhost.configuration - sle12sp5_terminal_configuration = module.sles12sp5-terminal.configuration - sle15sp4_terminal_configuration = module.sles15sp4-terminal.configuration + sle12sp5_terminal_configuration = module.sles12sp5_terminal.configuration + sle15sp4_terminal_configuration = module.sles15sp4_terminal.configuration - monitoringserver_configuration = module.monitoring-server.configuration + monitoringserver_configuration = module.monitoring_server.configuration } output "configuration" {