From 9bc21086a957beb65b15cffe279d9ea65f81e7a9 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Sun, 13 Oct 2024 11:14:00 +0200 Subject: [PATCH 1/6] ignore ssl errors --- jenkins_pipelines/environments/common/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins_pipelines/environments/common/pipeline.groovy b/jenkins_pipelines/environments/common/pipeline.groovy index 4e71bec2d..41084aac2 100644 --- a/jenkins_pipelines/environments/common/pipeline.groovy +++ b/jenkins_pipelines/environments/common/pipeline.groovy @@ -31,7 +31,7 @@ def run(params) { } // The 2obs jobs are releng, not dev prefix = prefix.replaceAll("-dev", "-releng") - def request = httpRequest "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json" + def request = httpRequest ignoreSslErrors: true url: "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json" def requestJson = readJSON text: request.getContent() product_commit = "${requestJson.actions.lastBuiltRevision.SHA1}" product_commit = product_commit.substring(product_commit.indexOf('[') + 1, product_commit.indexOf(']')); From f6b953f5b108de3eedc789996cd222296aa504fa Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Sun, 13 Oct 2024 11:14:44 +0200 Subject: [PATCH 2/6] fix syntax --- jenkins_pipelines/environments/common/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins_pipelines/environments/common/pipeline.groovy b/jenkins_pipelines/environments/common/pipeline.groovy index 41084aac2..29386a03d 100644 --- a/jenkins_pipelines/environments/common/pipeline.groovy +++ b/jenkins_pipelines/environments/common/pipeline.groovy @@ -31,7 +31,7 @@ def run(params) { } // The 2obs jobs are releng, not dev prefix = prefix.replaceAll("-dev", "-releng") - def request = httpRequest ignoreSslErrors: true url: "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json" + def request = httpRequest ignoreSslErrors: true, url: "https://ci.suse.de/job/${prefix}-2obs/lastBuild/api/json" def requestJson = readJSON text: request.getContent() product_commit = "${requestJson.actions.lastBuiltRevision.SHA1}" product_commit = product_commit.substring(product_commit.indexOf('[') + 1, product_commit.indexOf(']')); From 0d59c3ab50082571880414c893b1682b964dc24f Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Sun, 13 Oct 2024 11:27:38 +0200 Subject: [PATCH 3/6] provo is offline, switch to NUE --- .../environments/uyuni-master-dev-acceptance-tests-AWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-AWS b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-AWS index 8a7266cf7..9298c2615 100644 --- a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-AWS +++ b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-AWS @@ -1,6 +1,6 @@ #!/usr/bin/env groovy -node('sumaform-cucumber-provo') { +node('sumaform-cucumber') { properties([ buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '3')), disableConcurrentBuilds(), From 70b62758242cd52e19b40bddaa7d57934c7aad29 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:22:30 +1300 Subject: [PATCH 4/6] Remove unuse parameters for uyuni and 5.0 BV pipelines (#1425) --- .../SUSEManager-5.0-build-validation-NUE.tf | 104 ------------ .../SUSEManager-5.0-build-validation-PRV.tf | 106 +------------ .../Uyuni-Master-build-validation-NUE.tf | 148 +----------------- .../Uyuni-Master-build-validation-PRV.tf | 144 +---------------- 4 files changed, 14 insertions(+), 488 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 964d59709..9f3db38a9 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 @@ -212,11 +212,6 @@ module "proxy_containerized" { mac = "aa:b2:92:42:00:52" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-server.mgr.suse.de" - username = "admin" - password = "admin" - } runtime = "podman" container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile" auto_configure = false @@ -232,9 +227,6 @@ module "sles12sp5_minion" { mac = "aa:b2:92:42:00:61" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -250,9 +242,6 @@ module "sles15sp2_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -268,9 +257,6 @@ module "sles15sp3_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -286,9 +272,6 @@ module "sles15sp4_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -304,9 +287,6 @@ module "sles15sp5_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -322,9 +302,6 @@ module "sles15sp6_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -339,9 +316,6 @@ module "alma8_minion" { mac = "aa:b2:92:42:00:69" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -356,9 +330,6 @@ module "alma9_minion" { mac = "aa:b2:92:42:00:72" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -373,9 +344,6 @@ module "centos7_minion" { mac = "aa:b2:92:42:00:67" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -390,9 +358,6 @@ module "liberty9_minion" { mac = "aa:b2:92:42:00:75" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -407,9 +372,6 @@ module "oracle9_minion" { mac = "aa:b2:92:42:00:73" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -424,9 +386,6 @@ module "rocky8_minion" { mac = "aa:b2:92:42:00:68" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -441,9 +400,6 @@ module "rocky9_minion" { mac = "aa:b2:92:42:00:71" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -458,9 +414,6 @@ module "ubuntu2004_minion" { mac = "aa:b2:92:42:00:6a" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -475,9 +428,6 @@ module "ubuntu2204_minion" { mac = "aa:b2:92:42:00:6b" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -492,9 +442,6 @@ module "ubuntu2404_minion" { mac = "aa:b2:92:42:00:6d" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -510,9 +457,6 @@ module "debian11_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -528,9 +472,6 @@ module "debian12_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -551,9 +492,6 @@ module "opensuse155arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -574,9 +512,6 @@ module "opensuse156arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -631,15 +566,11 @@ module "slemicro51_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] install_salt_bundle = false } @@ -653,15 +584,11 @@ module "slemicro52_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] install_salt_bundle = false } @@ -675,15 +602,11 @@ module "slemicro53_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] install_salt_bundle = false } @@ -697,15 +620,11 @@ module "slemicro54_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] install_salt_bundle = false } @@ -719,15 +638,11 @@ module "slemicro55_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] install_salt_bundle = false } @@ -741,16 +656,11 @@ module "slmicro60_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true install_salt_bundle = false } @@ -1148,15 +1058,9 @@ module "sles12sp5_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - } module "sles12sp5_terminal" { @@ -1184,14 +1088,9 @@ module "sles15sp4_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - } module "sles15sp4_terminal" { @@ -1236,9 +1135,6 @@ module "monitoring_server" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" 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 a45e29522..acc60ff0e 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 @@ -390,9 +390,6 @@ module "sles12sp5_minion" { mac = "aa:b2:92:05:00:11" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -411,9 +408,6 @@ module "sles15sp2_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -432,9 +426,6 @@ module "sles15sp3_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -453,9 +444,6 @@ module "sles15sp4_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -474,9 +462,6 @@ module "sles15sp5_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -495,9 +480,6 @@ module "sles15sp6_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -515,9 +497,6 @@ module "alma8_minion" { mac = "aa:b2:92:05:00:19" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -535,9 +514,6 @@ module "alma9_minion" { mac = "aa:b2:92:05:00:22" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -555,9 +531,6 @@ module "centos7_minion" { mac = "aa:b2:92:05:00:17" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -575,9 +548,6 @@ module "liberty9_minion" { mac = "aa:b2:92:05:00:25" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -595,9 +565,6 @@ module "oracle9_minion" { mac = "aa:b2:92:05:00:23" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -615,9 +582,6 @@ module "rocky8_minion" { mac = "aa:b2:92:05:00:18" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -635,9 +599,6 @@ module "rocky9_minion" { mac = "aa:b2:92:05:00:21" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -655,9 +616,6 @@ module "ubuntu2004_minion" { mac = "aa:b2:92:05:00:1a" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -675,9 +633,6 @@ module "ubuntu2204_minion" { mac = "aa:b2:92:05:00:1b" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -695,9 +650,6 @@ module "ubuntu2404_minion" { mac = "aa:b2:92:05:00:1d" memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -716,9 +668,6 @@ module "debian11_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -737,9 +686,6 @@ module "debian12_minion" { memory = 4096 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -760,9 +706,6 @@ module "opensuse155arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -783,9 +726,6 @@ module "opensuse156arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -843,16 +783,12 @@ module "slemicro51_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true + install_salt_bundle = false } module "slemicro52_minion" { @@ -868,16 +804,12 @@ module "slemicro52_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true + install_salt_bundle = false } module "slemicro53_minion" { @@ -893,16 +825,12 @@ module "slemicro53_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true + install_salt_bundle = false } module "slemicro54_minion" { @@ -918,16 +846,12 @@ module "slemicro54_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true + install_salt_bundle = false } module "slemicro55_minion" { @@ -943,16 +867,12 @@ module "slemicro55_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true + install_salt_bundle = false } module "slmicro60_minion" { @@ -968,16 +888,11 @@ module "slmicro60_minion" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" // WORKAROUND: Does not work in sumaform, yet -// additional_packages = [ "venv-salt-minion" ] -// install_salt_bundle = true install_salt_bundle = false } @@ -1460,10 +1375,6 @@ module "sles12sp5_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" } @@ -1499,10 +1410,6 @@ module "sles15sp4_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" } @@ -1555,9 +1462,6 @@ module "monitoring_server" { memory = 2048 } - server_configuration = { - hostname = "suma-bv-50-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" 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 7f441e2d6..70b6b031a 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -216,11 +216,6 @@ module "proxy_containerized" { mac = "aa:b2:93:02:01:a2" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-server.mgr.suse.de" - username = "admin" - password = "admin" - } runtime = "podman" container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni" @@ -240,9 +235,7 @@ module "sles12sp5_minion" { mac = "aa:b2:93:02:01:b1" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } + auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -258,9 +251,6 @@ module "sles15sp2_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -276,9 +266,6 @@ module "sles15sp3_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -294,9 +281,6 @@ module "sles15sp4_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -312,9 +296,6 @@ module "sles15sp5_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -330,9 +311,6 @@ module "sles15sp6_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -347,15 +325,9 @@ module "alma8_minion" { mac = "aa:b2:93:02:01:b9" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "alma9_minion" { @@ -367,15 +339,9 @@ module "alma9_minion" { mac = "aa:b2:93:02:01:c2" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "centos7_minion" { @@ -387,15 +353,9 @@ module "centos7_minion" { mac = "aa:b2:93:02:01:b7" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "liberty9_minion" { @@ -407,15 +367,9 @@ module "liberty9_minion" { mac = "aa:b2:93:02:01:c5" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "oracle9_minion" { @@ -427,15 +381,9 @@ module "oracle9_minion" { mac = "aa:b2:93:02:01:c3" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky8_minion" { @@ -448,15 +396,9 @@ module "rocky8_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky9_minion" { @@ -468,15 +410,9 @@ module "rocky9_minion" { mac = "aa:b2:93:02:01:c1" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2004_minion" { @@ -488,16 +424,10 @@ module "ubuntu2004_minion" { mac = "aa:b2:93:02:01:ba" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2204_minion" { @@ -509,9 +439,6 @@ module "ubuntu2204_minion" { mac = "aa:b2:93:02:01:bb" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -526,9 +453,6 @@ module "ubuntu2404_minion" { mac = "aa:b2:93:02:01:bd" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -544,9 +468,6 @@ module "debian11_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -562,15 +483,9 @@ module "debian12_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "opensuse155arm_minion" { @@ -588,9 +503,6 @@ module "opensuse155arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -611,9 +523,6 @@ module "opensuse156arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -666,9 +575,6 @@ module "slemicro51_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -687,9 +593,6 @@ module "slemicro52_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -708,9 +611,6 @@ module "slemicro53_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -729,9 +629,6 @@ module "slemicro54_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -750,9 +647,6 @@ module "slemicro55_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -771,9 +665,6 @@ module "slmicro60_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -874,8 +765,6 @@ module "alma8_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "alma9_sshminion" { @@ -889,9 +778,6 @@ module "alma9_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "centos7_sshminion" { @@ -905,9 +791,6 @@ module "centos7_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "liberty9_sshminion" { @@ -921,9 +804,6 @@ module "liberty9_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "oracle9_sshminion" { @@ -937,9 +817,6 @@ module "oracle9_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky8_sshminion" { @@ -953,9 +830,6 @@ module "rocky8_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky9_sshminion" { @@ -969,9 +843,6 @@ module "rocky9_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2004_sshminion" { @@ -986,9 +857,6 @@ module "ubuntu2004_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2204_sshminion" { @@ -1041,9 +909,6 @@ module "debian12_sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "opensuse155arm_sshminion" { @@ -1196,10 +1061,6 @@ module "sles12sp5_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" } @@ -1230,10 +1091,6 @@ module "sles15sp4_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } - auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" } @@ -1263,9 +1120,6 @@ module "monitoring_server" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.suse.de" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" 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 612c0aa2e..d109bab2d 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -365,21 +365,16 @@ module "proxy_containerized" { source = "./modules/proxy_containerized" base_configuration = module.base_retail.configuration name = "proxy" - provider_settings = { + provider_settings = { mac = "aa:b2:93:04:05:6e" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-server.mgr.prv.suse.net" - username = "admin" - password = "admin" - } - runtime = "podman" - container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni" - container_tag = "latest" - auto_configure = false - ssh_key_path = "./salt/controller/id_rsa.pub" + runtime = "podman" + container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni" + container_tag = "latest" + auto_configure = false + ssh_key_path = "./salt/controller/id_rsa.pub" } // No traditional clients in Uyuni @@ -396,9 +391,6 @@ module "sles12sp5_minion" { mac = "aa:b2:93:04:05:7d" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -417,9 +409,6 @@ module "sles15sp2_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -438,9 +427,6 @@ module "sles15sp3_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -459,9 +445,6 @@ module "sles15sp4_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -480,9 +463,6 @@ module "sles15sp5_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -501,9 +481,6 @@ module "sles15sp6_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -521,15 +498,10 @@ module "alma8_minion" { mac = "aa:b2:93:04:05:85" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "alma9_minion" { @@ -544,15 +516,10 @@ module "alma9_minion" { mac = "aa:b2:93:04:05:8e" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "centos7_minion" { @@ -567,15 +534,10 @@ module "centos7_minion" { mac = "aa:b2:93:04:05:83" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "liberty9_minion" { @@ -590,15 +552,11 @@ module "liberty9_minion" { mac = "aa:b2:93:04:05:91" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } + auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "oracle9_minion" { @@ -613,15 +571,10 @@ module "oracle9_minion" { mac = "aa:b2:93:04:05:8f" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky8_minion" { @@ -636,15 +589,11 @@ module "rocky8_minion" { mac = "aa:b2:93:04:05:84" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } + auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky9_minion" { @@ -659,15 +608,10 @@ module "rocky9_minion" { mac = "aa:b2:93:04:05:8d" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2004_minion" { @@ -682,16 +626,10 @@ module "ubuntu2004_minion" { mac = "aa:b2:93:04:05:86" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2204_minion" { @@ -706,9 +644,6 @@ module "ubuntu2204_minion" { mac = "aa:b2:93:04:05:87" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -726,9 +661,6 @@ module "ubuntu2404_minion" { mac = "aa:b2:93:04:05:89" memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -747,9 +679,6 @@ module "debian11_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -768,15 +697,10 @@ module "debian12_minion" { memory = 4096 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "opensuse155arm_minion" { @@ -794,9 +718,6 @@ module "opensuse155arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -817,9 +738,6 @@ module "opensuse156arm_minion" { vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -876,9 +794,6 @@ module "slemicro51_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -900,9 +815,6 @@ module "slemicro52_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -924,9 +836,6 @@ module "slemicro53_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -948,9 +857,6 @@ module "slemicro54_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -972,9 +878,6 @@ module "slemicro55_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -996,9 +899,6 @@ module "slmicro60_minion" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -1120,8 +1020,6 @@ module "alma8_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "alma9_sshminion" { @@ -1139,8 +1037,6 @@ module "alma9_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "centos7_sshminion" { @@ -1158,8 +1054,6 @@ module "centos7_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "liberty9_sshminion" { @@ -1177,8 +1071,6 @@ module "liberty9_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "oracle9_sshminion" { @@ -1196,8 +1088,6 @@ module "oracle9_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky8_sshminion" { @@ -1215,8 +1105,6 @@ module "rocky8_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "rocky9_sshminion" { @@ -1234,8 +1122,6 @@ module "rocky9_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2004_sshminion" { @@ -1253,9 +1139,6 @@ module "ubuntu2004_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "ubuntu2204_sshminion" { @@ -1321,8 +1204,6 @@ module "debian12_sshminion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } module "opensuse155arm_sshminion" { @@ -1496,9 +1377,6 @@ module "sles12sp5_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -1535,9 +1413,6 @@ module "sles15sp4_buildhost" { memory = 2048 vcpu = 2 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" @@ -1574,9 +1449,6 @@ module "monitoring_server" { memory = 2048 } - server_configuration = { - hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" - } auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" From 5f015ffc55a667064dc88866051572ff32bead63 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 14 Oct 2024 15:30:12 +0200 Subject: [PATCH 5/6] Run Rubocop from a container (#1432) --- .../manager_prs/tests_files/rubocop.sh | 8 +------- .../uyuni_prs/tests_files/rubocop.sh | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/jenkins_pipelines/manager_prs/tests_files/rubocop.sh b/jenkins_pipelines/manager_prs/tests_files/rubocop.sh index 3ddd27b08..1e1ba608f 100755 --- a/jenkins_pipelines/manager_prs/tests_files/rubocop.sh +++ b/jenkins_pipelines/manager_prs/tests_files/rubocop.sh @@ -5,15 +5,9 @@ rubocop_file="testsuite/.rubocop.yml" if [[ -f "$rubocop_file" ]]; then # Extract the Ruby version from the file ruby_version=$(grep "TargetRubyVersion:" "$rubocop_file" | awk '{print $2}') - # Temporary skip the check for Ruby 3.3 - if [[ "$ruby_version" == "3.3" ]]; then - echo "Skipping Rubocop for Ruby 3.3, until sumadockers support it." - exit 0 - fi if [[ -n "$ruby_version" ]]; then - rubocop.ruby"$ruby_version" -v cd testsuite - rubocop.ruby"$ruby_version" features/* + docker run --rm --volume "$PWD:/app" docker.io/srbarrios/rubocop:ruby-$ruby_version else echo "No TargetRubyVersion found in $rubocop_file." fi diff --git a/jenkins_pipelines/uyuni_prs/tests_files/rubocop.sh b/jenkins_pipelines/uyuni_prs/tests_files/rubocop.sh index 9a8818147..1e1ba608f 100755 --- a/jenkins_pipelines/uyuni_prs/tests_files/rubocop.sh +++ b/jenkins_pipelines/uyuni_prs/tests_files/rubocop.sh @@ -1,6 +1,16 @@ #! /bin/bash echo "running rubocop on step files" -rubocop.ruby2.5 -v -cd testsuite -rubocop.ruby2.5 features/* +rubocop_file="testsuite/.rubocop.yml" +if [[ -f "$rubocop_file" ]]; then + # Extract the Ruby version from the file + ruby_version=$(grep "TargetRubyVersion:" "$rubocop_file" | awk '{print $2}') + if [[ -n "$ruby_version" ]]; then + cd testsuite + docker run --rm --volume "$PWD:/app" docker.io/srbarrios/rubocop:ruby-$ruby_version + else + echo "No TargetRubyVersion found in $rubocop_file." + fi +else + echo "File $rubocop_file does not exist." +fi From d42c73657baa1fe6dc10e24ebca9a6ee57717126 Mon Sep 17 00:00:00 2001 From: Marek Czernek Date: Tue, 15 Oct 2024 10:38:39 +0200 Subject: [PATCH 6/6] Disable installing salt bundle on classic leap --- .../tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf index 63c18e5c3..d2fb56139 100644 --- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf +++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf @@ -111,6 +111,7 @@ module "salt-shaker-products-testing" { provider_settings = { mac = "aa:b2:93:01:01:d9" } + install_salt_bundle = false } output "configuration" {