From fec9d7a34ea36313f5ff87a559ab6ee8518710a2 Mon Sep 17 00:00:00 2001 From: Welder Luz Date: Tue, 14 Nov 2023 16:05:01 -0300 Subject: [PATCH 1/2] Add SLE Micro 5.5 --- backend_modules/libvirt/base/main.tf | 1 + modules/controller/main.tf | 2 ++ modules/controller/variables.tf | 14 ++++++++++++++ salt/controller/bashrc | 2 ++ salt/mirror/etc/minima.yaml | 2 ++ 5 files changed, 21 insertions(+) diff --git a/backend_modules/libvirt/base/main.tf b/backend_modules/libvirt/base/main.tf index e7eb2e5e5..98c63772f 100644 --- a/backend_modules/libvirt/base/main.tf +++ b/backend_modules/libvirt/base/main.tf @@ -45,6 +45,7 @@ locals { slemicro52-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_52/SUSE-MicroOS.x86_64-sumaform.qcow2" slemicro53-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_53/SLE-Micro.x86_64-sumaform.qcow2" slemicro54-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_54/SLE-Micro.x86_64-sumaform.qcow2" + slemicro55-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_55/SLE-Micro.x86_64-sumaform.qcow2" } pool = lookup(var.provider_settings, "pool", "default") network_name = lookup(var.provider_settings, "network_name", "default") diff --git a/modules/controller/main.tf b/modules/controller/main.tf index d531e7f6c..a674a5a42 100644 --- a/modules/controller/main.tf +++ b/modules/controller/main.tf @@ -99,6 +99,8 @@ module "controller" { slemicro53_sshminion = length(var.slemicro53_sshminion_configuration["hostnames"]) > 0 ? var.slemicro53_sshminion_configuration["hostnames"][0] : null slemicro54_minion = length(var.slemicro54_minion_configuration["hostnames"]) > 0 ? var.slemicro54_minion_configuration["hostnames"][0] : null slemicro54_sshminion = length(var.slemicro54_sshminion_configuration["hostnames"]) > 0 ? var.slemicro54_sshminion_configuration["hostnames"][0] : null + slemicro55_minion = length(var.slemicro55_minion_configuration["hostnames"]) > 0 ? var.slemicro55_minion_configuration["hostnames"][0] : null + slemicro55_sshminion = length(var.slemicro55_sshminion_configuration["hostnames"]) > 0 ? var.slemicro55_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 index 26cbc2294..f8135c324 100644 --- a/modules/controller/variables.tf +++ b/modules/controller/variables.tf @@ -357,6 +357,20 @@ variable "slemicro54_sshminion_configuration" { } } +variable "slemicro55_minion_configuration" { + description = "use module..configuration, see main.tf.libvirt-testsuite.example" + default = { + hostnames = [] + } +} + +variable "slemicro55_sshminion_configuration" { + description = "use module..configuration, see main.tf.libvirt-testsuite.example" + default = { + hostnames = [] + } +} + variable "centos7_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { diff --git a/salt/controller/bashrc b/salt/controller/bashrc index 109690267..f134cd40f 100644 --- a/salt/controller/bashrc +++ b/salt/controller/bashrc @@ -59,6 +59,8 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %} {% if grains.get('slemicro53_sshminion') | default(false, true) %}export SLEMICRO53_SSHMINION="{{ grains.get('slemicro53_sshminion') }}" {% else %}# no SLEMICRO53 ssh minion defined {% endif %} {% if grains.get('slemicro54_minion') | default(false, true) %}export SLEMICRO54_MINION="{{ grains.get('slemicro54_minion') }}" {% else %}# no SLEMICRO54 minion defined {% endif %} {% if grains.get('slemicro54_sshminion') | default(false, true) %}export SLEMICRO54_SSHMINION="{{ grains.get('slemicro54_sshminion') }}" {% else %}# no SLEMICRO54 ssh minion defined {% endif %} +{% if grains.get('slemicro55_minion') | default(false, true) %}export SLEMICRO55_MINION="{{ grains.get('slemicro55_minion') }}" {% else %}# no SLEMICRO55 minion 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('alma9_minion') | default(false, true) %}export ALMA9_MINION="{{ grains.get('alma9_minion') }}" {% else %}# no ALMA9 minion defined {% endif %} {% if grains.get('alma9_sshminion') | default(false, true) %}export ALMA9_SSHMINION="{{ grains.get('alma9_sshminion') }}" {% else %}# no ALMA9 ssh minion defined {% endif %} {% if grains.get('centos7_minion') | default(false, true) %}export CENTOS7_MINION="{{ grains.get('centos7_minion') }}" {% else %}# no CENTOS7 minion defined {% endif %} diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml index 96bc5669b..b9be6794a 100644 --- a/salt/mirror/etc/minima.yaml +++ b/salt/mirror/etc/minima.yaml @@ -114,6 +114,8 @@ scc: - SLE-Micro-5.3-Updates - SLE-Micro-5.4-Pool - SLE-Micro-5.4-Updates + - SLE-Micro-5.5-Pool + - SLE-Micro-5.5-Updates # SLE 15-SP4 Products - SLE-Product-SLES15-SP4-Pool - SLE-Product-SLES15-SP4-Updates From 3a9ede5c57c98678198d9032b5f6e0e63e5f084d Mon Sep 17 00:00:00 2001 From: Can Bulut Bayburt Date: Wed, 15 Nov 2023 12:13:22 +0100 Subject: [PATCH 2/2] Bump the default SLE Micro version to 5.5 in the testsuite module --- modules/cucumber_testsuite/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cucumber_testsuite/main.tf b/modules/cucumber_testsuite/main.tf index 9375dac7f..b8b3a3dac 100644 --- a/modules/cucumber_testsuite/main.tf +++ b/modules/cucumber_testsuite/main.tf @@ -233,7 +233,7 @@ module "slemicro-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") + image = lookup(local.images, "slemicro-minion", "slemicro55-ign") name = lookup(local.names, "slemicro-minion", "min-slemicro5") server_configuration = local.minimal_configuration