Remove sles12sp5

Add support to sles15sp6 and sp7 buildhost

Author: maximenoel8

README_ADVANCED.md

@@ -644,7 +644,7 @@ module "build_host"
   base_configuration = module.base.configuration
 
   name = "buildhost"
-  image = "sles15sp3o"
+  image = "sles15sp7o"
 }
 ```
 

modules/controller/main.tf

@@ -140,12 +140,12 @@ module "controller" {
     ubuntu2404_sshminion     = length(var.ubuntu2404_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2404_sshminion_configuration["hostnames"][0] : null
     debian12_minion          = length(var.debian12_minion_configuration["hostnames"]) > 0 ? var.debian12_minion_configuration["hostnames"][0] : null
     debian12_sshminion       = length(var.debian12_sshminion_configuration["hostnames"]) > 0 ? var.debian12_sshminion_configuration["hostnames"][0] : null
-    sle12sp5_buildhost       = length(var.sle12sp5_buildhost_configuration["hostnames"]) > 0 ? var.sle12sp5_buildhost_configuration["hostnames"][0] : null
-    sle12sp5_terminal_mac    = var.sle12sp5_terminal_configuration["private_mac"]
-    sle15sp3_buildhost       = length(var.sle15sp3_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp3_buildhost_configuration["hostnames"][0] : null
-    sle15sp3_terminal_mac    = var.sle15sp3_terminal_configuration["private_mac"]
     sle15sp4_buildhost       = length(var.sle15sp4_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp4_buildhost_configuration["hostnames"][0] : null
     sle15sp4_terminal_mac    = var.sle15sp4_terminal_configuration["private_mac"]
+    sle15sp6_buildhost       = length(var.sle15sp6_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp6_buildhost_configuration["hostnames"][0] : null
+    sle15sp7_buildhost       = length(var.sle15sp7_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp7_buildhost_configuration["hostnames"][0] : null
+    sle15sp6_terminal_mac    = var.sle15sp6_terminal_configuration["private_mac"]
+    sle15sp7_terminal_mac    = var.sle15sp7_terminal_configuration["private_mac"]
     opensuse155arm_minion    = length(var.opensuse155arm_minion_configuration["hostnames"]) > 0 ? var.opensuse155arm_minion_configuration["hostnames"][0] : null
     opensuse155arm_sshminion = length(var.opensuse155arm_sshminion_configuration["hostnames"]) > 0 ? var.opensuse155arm_sshminion_configuration["hostnames"][0] : null
     opensuse156arm_minion    = length(var.opensuse156arm_minion_configuration["hostnames"]) > 0 ? var.opensuse156arm_minion_configuration["hostnames"][0] : null

modules/controller/variables.tf

@@ -575,25 +575,22 @@ variable "sle15sp4_buildhost_configuration" {
   }
 }
 
-variable "sle15sp4_terminal_configuration" {
-  description = "use module.<SLE15SP4_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
+variable "sle15sp6_buildhost_configuration" {
+  description = "use module.<SLE15SP6_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
-    private_mac = null
-    private_ip = null
-    private_name = null
-    image = null
+    hostnames = []
   }
 }
 
-variable "sle15sp3_buildhost_configuration" {
-  description = "use module.<SLE15SP3_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
+variable "sle15sp7_buildhost_configuration" {
+  description = "use module.<SLE15SP7_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
     hostnames = []
   }
 }
 
-variable "sle15sp3_terminal_configuration" {
-  description = "use module.<SLE15SP3_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
+variable "sle15sp4_terminal_configuration" {
+  description = "use module.<SLE15SP4_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
     private_mac = null
     private_ip = null
@@ -602,15 +599,18 @@ variable "sle15sp3_terminal_configuration" {
   }
 }
 
-variable "sle12sp5_buildhost_configuration" {
-  description = "use module.<SLE12SP5_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
+variable "sle15sp6_terminal_configuration" {
+  description = "use module.<SLE15SP6_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
-    hostnames = []
+    private_mac = null
+    private_ip = null
+    private_name = null
+    image = null
   }
 }
 
-variable "sle12sp5_terminal_configuration" {
-  description = "use module.<SLE12SP5_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
+variable "sle15sp7_terminal_configuration" {
+  description = "use module.<SLE15SP7_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
     private_mac = null
     private_ip = null

salt/controller/bashrc

@@ -99,10 +99,10 @@ export BUILD_SOURCES="dist.nue.suse.com"
 {% if grains.get('debian12_sshminion') | default(false, true) %}export DEBIAN12_SSHMINION="{{ grains.get('debian12_sshminion') }}" {% else %}# no DEBIAN12 ssh minion defined {% endif %}
 {% if grains.get('sle15sp4_buildhost') | default(false, true) %}export SLE15SP4_BUILDHOST="{{ grains.get('sle15sp4_buildhost') }}" {% else %}# no SLE15SP4 buildhost defined {% endif %}
 {% if grains.get('sle15sp4_terminal_mac') | default(false, true) %}export SLE15SP4_TERMINAL_MAC="{{ grains.get('sle15sp4_terminal_mac') }}" {% else %}# no SLE15SP4 terminal MAC defined {% endif %}
-{% if grains.get('sle15sp3_buildhost') | default(false, true) %}export SLE15SP3_BUILDHOST="{{ grains.get('sle15sp3_buildhost') }}" {% else %}# no SLE15SP3 buildhost defined {% endif %}
-{% if grains.get('sle15sp3_terminal_mac') | default(false, true) %}export SLE15SP3_TERMINAL_MAC="{{ grains.get('sle15sp3_terminal_mac') }}" {% else %}# no SLE15SP3 terminal MAC defined {% endif %}
-{% if grains.get('sle12sp5_buildhost') | default(false, true) %}export SLE12SP5_BUILDHOST="{{ grains.get('sle12sp5_buildhost') }}" {% else %}# no SLE12SP5 buildhost defined {% endif %}
-{% if grains.get('sle12sp5_terminal_mac') | default(false, true) %}export SLE12SP5_TERMINAL_MAC="{{ grains.get('sle12sp5_terminal_mac') }}" {% else %}# no SLE12SP5 terminal MAC defined {% endif %}
+{% if grains.get('sle15sp6_buildhost') | default(false, true) %}export SLE15SP6_BUILDHOST="{{ grains.get('sle15sp6_buildhost') }}" {% else %}# no SLE15SP6 buildhost defined {% endif %}
+{% if grains.get('sle15sp7_buildhost') | default(false, true) %}export SLE15SP7_BUILDHOST="{{ grains.get('sle15sp7_buildhost') }}" {% else %}# no SLE15SP7 buildhost defined {% endif %}
+{% if grains.get('sle15sp6_terminal_mac') | default(false, true) %}export SLE15SP6_TERMINAL_MAC="{{ grains.get('sle15sp6_terminal_mac') }}" {% else %}# no SLE15SP6 terminal MAC defined {% endif %}
+{% if grains.get('sle15sp7_terminal_mac') | default(false, true) %}export SLE15SP7_TERMINAL_MAC="{{ grains.get('sle15sp7_terminal_mac') }}" {% else %}# no SLE15SP7 terminal MAC defined {% endif %}
 {% if grains.get('opensuse155arm_minion') | default(false, true) %}export OPENSUSE155ARM_MINION="{{ grains.get('opensuse155arm_minion') }}" {% else %}# no OPENSUSE155ARM minion defined {% endif %}
 {% if grains.get('opensuse155arm_sshminion') | default(false, true) %}export OPENSUSE155ARM_SSHMINION="{{ grains.get('opensuse155arm_sshminion') }}" {% else %}# no OPENSUSE155ARM ssh minion defined {% endif %}
 {% if grains.get('opensuse156arm_minion') | default(false, true) %}export OPENSUSE156ARM_MINION="{{ grains.get('opensuse156arm_minion') }}" {% else %}# no OPENSUSE156ARM minion defined {% endif %}