change for SLE Micro 5.3 (#1253)

uyuni-project · Feb 22, 2023 · 50f73db · 50f73db
1 parent d4543a7
commit 50f73db
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 1 deletion.
diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf
@@ -54,6 +54,14 @@ 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 = {

diff --git a/modules/cucumber_testsuite/main.tf b/modules/cucumber_testsuite/main.tf
@@ -165,7 +165,7 @@ module "suse-sshminion" {
   product_version    = var.product_version
   image              = lookup(local.images, "suse-sshminion", "sles15sp4o")
   name               = lookup(local.names, "suse-sshminion", "minssh-sles15")
- sles_registration_code = lookup(local.sles_registration_code, "suse-sshminion", null)
+  sles_registration_code = lookup(local.sles_registration_code, "suse-sshminion", null)
 
   use_os_released_updates = true
   ssh_key_path            = "./salt/controller/id_rsa.pub"
@@ -178,6 +178,29 @@ module "suse-sshminion" {
   provider_settings = lookup(local.provider_settings_by_host, "suse-sshminion", {})
 }
 
+module "slemicro-minion" {
+  source = "../minion"
+
+  quantity = contains(local.hosts, "slemicro-minion") ? 1 : 0
+  base_configuration = module.base.configuration
+  product_version    = var.product_version
+  image              = lookup(local.images, "slemicro-minion", "slemicro53-ign")
+  name               = lookup(local.names, "slemicro-minion", "min-slemicro5")
+
+  server_configuration = local.minimal_configuration
+  sles_registration_code = lookup(local.sles_registration_code, "slemicro-minion", null)
+
+  use_os_released_updates = true
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+  install_salt_bundle     = lookup(local.install_salt_bundle, "slemicro-minion", false)
+
+  additional_repos  = lookup(local.additional_repos, "slemicro-minion", {})
+  additional_repos_only  = lookup(local.additional_repos_only, "slemicro-minion", {})
+  additional_packages = lookup(local.additional_packages, "slemicro-minion", ["avahi", "avahi-lang", "libavahi-common3", "libavahi-core7"])
+  additional_grains = lookup(local.additional_grains, "slemicro-minion", {})
+  provider_settings = lookup(local.provider_settings_by_host, "slemicro-minion", {})
+}
+
 module "redhat-minion" {
   source = "../minion"
 
@@ -318,6 +341,7 @@ module "controller" {
   client_configuration           = contains(local.hosts, "suse-client") ? module.suse-client.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
   minion_configuration           = contains(local.hosts, "suse-minion") ? module.suse-minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
   sshminion_configuration        = contains(local.hosts, "suse-sshminion") ? module.suse-sshminion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
+  slemicro_minion_configuration  = contains(local.hosts, "slemicro-minion") ? module.slemicro-minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }  
   redhat_configuration           = contains(local.hosts, "redhat-minion") ? module.redhat-minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
   debian_configuration           = contains(local.hosts, "debian-minion") ? module.debian-minion.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
   buildhost_configuration        = contains(local.hosts, "build-host") ? module.build-host.configuration : { hostnames = [], ids = [], ipaddrs = [], macaddrs = [] }
@@ -351,6 +375,7 @@ output "configuration" {
     server = module.server.configuration
     proxy = module.proxy.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
     redhat-minion = module.redhat-minion.configuration

diff --git a/salt/default/init.sls b/salt/default/init.sls
@@ -1,13 +1,21 @@
 include:
   - default.locale
+  {% if not grains['osfullname'] == 'SLE Micro' %}
+  # Dependencies already satisfied by the images
+  # https://build.opensuse.org/project/show/systemsmanagement:sumaform:images:microos
   - default.minimal
+  {% endif %}
   - default.pkgs
   - default.grub
   - default.sshd
   {% if grains.get('reset_ids') | default(false, true) %}
   - default.ids
   {% endif %}
+  {% if not grains['osfullname'] == 'SLE Micro' %}
+  # Dependencies already satisfied by the images
+  # https://build.opensuse.org/project/show/systemsmanagement:sumaform:images:microos
   - default.testsuite
+  {% endif %}
 
 {% if grains.get('use_os_released_updates') | default(False, true) %}
 update_packages:

diff --git a/salt/first_deployment_highstate.sh b/salt/first_deployment_highstate.sh
diff --git a/salt/minion/init.sls b/salt/minion/init.sls
@@ -6,11 +6,15 @@ include:
   - minion.testsuite
   - minion.reflector
 
+{% if not grains['osfullname'] == 'SLE Micro' %}
+# Dependencies already satisfied by the images
+# https://build.opensuse.org/project/show/systemsmanagement:sumaform:images:microos
 minion_package:
   pkg.installed:
     - name: salt-minion
     - require:
       - sls: default
+{% endif %}
 
 {% if grains.get('evil_minion_count') %}
 evil_minions_package:

diff --git a/salt/minion/testsuite.sls b/salt/minion/testsuite.sls
@@ -1,12 +1,16 @@
 {% if grains.get('testsuite') | default(false, true) %}
 
+{% if not grains['osfullname'] == 'SLE Micro' %}
+# Dependencies already satisfied by the images
+# https://build.opensuse.org/project/show/systemsmanagement:sumaform:images:microos
 minion_cucumber_requisites:
   pkg.installed:
     - pkgs:
       - salt-minion
       - wget
     - require:
       - sls: default
+{% endif %}
 
 {% if grains['os'] == 'SUSE' %}
 {% if '12' in grains['osrelease'] or '15' in grains['osrelease']%}

diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml
@@ -107,6 +107,11 @@ scc:
     - SLE-Module-DevTools15-SP3-Updates
     - SLE-Module-Python2-15-SP3-Pool
     - SLE-Module-Python2-15-SP3-Update
+    # SLE Micro
+    - SLE-Micro-5.2-Pool
+    - SLE-Micro-5.2-Updates
+    - SLE-Micro-5.3-Pool
+    - SLE-Micro-5.3-Updates
     # SLE 15-SP4 Products
     - SLE-Product-SLES15-SP4-Pool
     - SLE-Product-SLES15-SP4-Updates