Add support for SL Micro 6.1 hosts (#1771)

uyuni-project · Jan 22, 2025 · fb0c89b · fb0c89b
1 parent 7cdaed1
commit fb0c89b
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 16 deletions.
diff --git a/README_ADVANCED.md b/README_ADVANCED.md
@@ -20,7 +20,7 @@ Legal values for work-in-progress software are:
 - `4.3-VM-nightly` (corresponds to the VM image in the Build Service project Devel:Galaxy:Manager:4.3)
 - `4.3-beta` (corresponds to the Build Service project SUSE:SLE-15-SP4:Update:Products:Manager43)
 - `5.0-nightly` (corresponds to the Build Service project Devel:Galaxy:Manager:5.0)
-- `head` (corresponds to the Build Service project Devel:Galaxy:Manager:Head, uses SLE Micro as the base image for server)
+- `head` (corresponds to the Build Service project Devel:Galaxy:Manager:Head, uses SL Micro 6.1 as the base image for server)
 - `uyuni-master` (corresponds to the Build Service project systemsmanagement:Uyuni:Master, for `server` and `proxy` only works with openSUSE Leap image)
 
 **Important:** sumaform only supports containerized deployments for SUSE Manager versions 5.0 and later.

diff --git a/backend_modules/libvirt/host/combustion b/backend_modules/libvirt/host/combustion
@@ -159,7 +159,7 @@ PACKAGES="$PACKAGES mgradm mgrctl mgradm-bash-completion mgrctl-bash-completion"
 %{ endif }
 
 %{ if container_proxy }
-PACKAGES="$PACKAGES  mgrpxy"
+PACKAGES="$PACKAGES mgrpxy"
 %{ endif }
 
 %{ if install_salt_bundle }

diff --git a/modules/controller/main.tf b/modules/controller/main.tf
@@ -102,6 +102,8 @@ module "controller" {
     slemicro55_sshminion = length(var.slemicro55_sshminion_configuration["hostnames"]) > 0 ? var.slemicro55_sshminion_configuration["hostnames"][0] : null
     slmicro60_minion     = length(var.slmicro60_minion_configuration["hostnames"]) > 0 ? var.slmicro60_minion_configuration["hostnames"][0] : null
     slmicro60_sshminion  = length(var.slmicro60_sshminion_configuration["hostnames"]) > 0 ? var.slmicro60_sshminion_configuration["hostnames"][0] : null
+    slmicro61_minion     = length(var.slmicro61_minion_configuration["hostnames"]) > 0 ? var.slmicro61_minion_configuration["hostnames"][0] : null
+    slmicro61_sshminion  = length(var.slmicro61_sshminion_configuration["hostnames"]) > 0 ? var.slmicro61_sshminion_configuration["hostnames"][0] : null
     centos7_minion       = length(var.centos7_minion_configuration["hostnames"]) > 0 ? var.centos7_minion_configuration["hostnames"][0] : null
     centos7_sshminion    = length(var.centos7_sshminion_configuration["hostnames"]) > 0 ? var.centos7_sshminion_configuration["hostnames"][0] : null
     centos7_client       = length(var.centos7_client_configuration["hostnames"]) > 0 ? var.centos7_client_configuration["hostnames"][0] : null

diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf
@@ -54,14 +54,6 @@ variable "minion_configuration" {
   }
 }
 
-variable "slemicro_minion_configuration" {
-  description = "use module.<SLE_MICRO_MINION_NAME>.configuration, see main.tf.libvirt-testsuite.example"
-  default = {
-    ids       = []
-    hostnames = []
-  }
-}
-
 variable "buildhost_configuration" {
   description = "use module.<BUILDHOST_NAME>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
@@ -352,13 +344,27 @@ variable "slmicro60_minion_configuration" {
   }
 }
 
+variable "slmicro61_minion_configuration" {
+  description = "use module.<SLMICRO61_MINION>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
 variable "slmicro60_sshminion_configuration" {
   description = "use module.<SLMICRO60_SSHMINION>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
     hostnames = []
   }
 }
 
+variable "slmicro61_sshminion_configuration" {
+  description = "use module.<SLMICRO61_SSHMINION>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
 variable "centos7_minion_configuration" {
   description = "use module.<CENTOS7_MINION>.configuration, see main.tf.libvirt-testsuite.example"
   default = {

diff --git a/modules/cucumber_testsuite/main.tf b/modules/cucumber_testsuite/main.tf
@@ -472,7 +472,6 @@ module "controller" {
   client_configuration           = contains(local.hosts, "suse_client") ? module.suse_client.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
   minion_configuration           = contains(local.hosts, "suse_minion") ? module.suse_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
   sshminion_configuration        = contains(local.hosts, "suse_sshminion") ? module.suse_sshminion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
-  slemicro_minion_configuration  = contains(local.hosts, "slemicro_minion") ? module.slemicro_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
   # TODO: rename redhat_configuration and debian_configuration to rhlike_configuration and deblike_configuration once the renaming is done: https://github.com/SUSE/spacewalk/issues/25062
   redhat_configuration           = contains(local.hosts, "rhlike_minion") ? module.rhlike_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
   debian_configuration           = contains(local.hosts, "deblike_minion") ? module.deblike_minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [], private_macs = [] }
@@ -506,7 +505,6 @@ output "configuration" {
     server = var.container_server ? module.server_containerized[0].configuration : module.server[0].configuration
     proxy = var.container_proxy ? module.proxy_containerized[0].configuration : module.proxy[0].configuration
     suse_client = module.suse_client.configuration
-    slemicro_minion = module.slemicro_minion.configuration
     suse_minion = module.suse_minion.configuration
     suse_sshminion = module.suse_sshminion.configuration
     rhlike_minion = module.rhlike_minion.configuration

diff --git a/modules/cucumber_testsuite/variables.tf b/modules/cucumber_testsuite/variables.tf
@@ -38,7 +38,7 @@ variable "name_prefix" {
 
 variable "images" {
   description = "list of images to be uploaded to the libvirt host, leave default for all"
-  default     = ["centos7o", "opensuse155o", "leapmicro55o", "slemicro55o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o", "suma43VM-ign"]
+  default     = ["centos7o", "opensuse155o", "leapmicro55o", "slemicro55o", "slmicro60o", "slmicro61o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o", "suma43VM-ign"]
 }
 
 variable "main_disk_size" {

diff --git a/salt/controller/bashrc b/salt/controller/bashrc
@@ -57,6 +57,8 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %}
 {% if grains.get('slemicro55_sshminion') | default(false, true) %}export SLEMICRO55_SSHMINION="{{ grains.get('slemicro55_sshminion') }}" {% else %}# no SLEMICRO55 ssh minion defined {% endif %}
 {% if grains.get('slmicro60_minion') | default(false, true) %}export SLMICRO60_MINION="{{ grains.get('slmicro60_minion') }}" {% else %}# no SLMICRO60 minion defined {% endif %}
 {% if grains.get('slmicro60_sshminion') | default(false, true) %}export SLMICRO60_SSHMINION="{{ grains.get('slmicro60_sshminion') }}" {% else %}# no SLMICRO60 ssh minion defined {% endif %}
+{% if grains.get('slmicro61_minion') | default(false, true) %}export SLMICRO61_MINION="{{ grains.get('slmicro61_minion') }}" {% else %}# no SLMICRO61 minion defined {% endif %}
+{% if grains.get('slmicro61_sshminion') | default(false, true) %}export SLMICRO61_SSHMINION="{{ grains.get('slmicro61_sshminion') }}" {% else %}# no SLMICRO61 ssh minion defined {% endif %}
 {% if grains.get('alma8_minion') | default(false, true) %}export ALMA8_MINION="{{ grains.get('alma8_minion') }}" {% else %}# no ALMA8 minion defined {% endif %}
 {% if grains.get('alma8_sshminion') | default(false, true) %}export ALMA8_SSHMINION="{{ grains.get('alma8_sshminion') }}" {% else %}# no ALMA8 ssh minion defined {% endif %}
 {% if grains.get('alma9_minion') | default(false, true) %}export ALMA9_MINION="{{ grains.get('alma9_minion') }}" {% else %}# no ALMA9 minion defined {% endif %}

diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml
@@ -63,6 +63,7 @@ scc:
       # SL Micro
       - SL-Micro-6.0-Pool
       - SL-Micro-6.0-Updates
+      - SL-Micro-6.1-Pool
       # SLE 15-SP4 Products
       - SLE-Product-SLES15-SP4-Pool
       - SLE-Product-SLES15-SP4-Updates

diff --git a/salt/repos/client_tools.sls b/salt/repos/client_tools.sls
@@ -211,7 +211,26 @@ tools_update_repo:
 
 {% elif grains['osfullname'] == 'SL-Micro' %}
 
-{# TODO: add SL Micro 6 #}
+{% if not grains.get('product_version') or not grains.get('product_version').startswith('uyuni-') %} {# Released Tools repos #}
+
+tools_pool_repo:
+  pkgrepo.managed:
+    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SUSE-Manager-Tools-For-SL-Micro/6/{{ grains.get("cpuarch") }}/product/
+    - refresh: True
+
+{% else %}
+
+tools_pool_repo:
+  pkgrepo.managed:
+    - baseurl: http://{{ grains.get("mirror") | default("downloadcontent.opensuse.org", true) }}/repositories/systemsmanagement:/Uyuni:/Stable:/SLE15-Uyuni-Client-Tools/SLE_15/
+    - refresh: True
+
+{% endif %} {# Released Tools repos #}
+
+tools_additional_repo:
+  pkgrepo.managed:
+    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/Head:/SL-Micro-6-SUSE-Manager-Tools/SL-Micro6/
+    - refresh: True
 
 {% elif grains['osfullname'] == 'SLE Micro' %}
 

diff --git a/salt/repos/testsuite.sls b/salt/repos/testsuite.sls
@@ -17,7 +17,7 @@ uyuni_key_for_fake_packages:
     - name: transactional-update -c run rpm --import http://{{ grains.get("mirror") | default("minima-mirror-ci-bv.mgr.prv.suse.net", true) }}/uyuni.key
 {% endif %}
 
-{% if not (grains['osfullname'] in ['SL-Micro'] and grains['osrelease'] in ['6.0']) and not (grains['osfullname'] in ['openSUSE Leap Micro'] and grains['osrelease'] in ['5.5']) %}
+{% if not (grains['osfullname'] in ['SLE-Micro', 'SL-Micro', 'openSUSE Leap Micro']) %}
 test_repo_rpm_pool:
   pkgrepo.managed:
     - baseurl: http://{{ grains.get("mirror") | default("downloadcontent.opensuse.org", true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/

diff --git a/salt/salt_testenv/salt_bundle_package.sls b/salt/salt_testenv/salt_bundle_package.sls
@@ -36,6 +36,9 @@
     {% if grains['osrelease'] == '6.0' %}
         {% set repo_path = 'SLMicro60' %}
     {% endif %}
+    {% if grains['osrelease'] == '6.1' %}
+        {% set repo_path = 'SLMicro61' %}
+    {% endif %}
 {% endif %}
 
 {% if grains['salt_obs_flavor'] != 'saltstack' %}

diff --git a/salt/server_containerized/testsuite.sls b/salt/server_containerized/testsuite.sls
@@ -105,7 +105,7 @@ repo_key_import:
     - onchanges:
       - file: galaxy_key_copy_host
 
-# needed for SL Micro 6.0 maintenance updates coming from staging e.g.
+# needed for SL Micro maintenance updates coming from staging e.g.
 # https://download.suse.de/ibs/SUSE:/ALP:/Source:/Standard:/1.0:/Staging:/Z/standard/
 suse_staging_key_copy_host:
   file.managed: