Skip to content

Commit fa46fc7

Browse files
maximenoel8maximenoel8
committed
Remove sles12sp5
Add support to sles15sp6 and sp7 buildhost
1 parent da7a1a5 commit fa46fc7

File tree

4 files changed

+41
-20
lines changed

4 files changed

+41
-20
lines changed

‎README_ADVANCED.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ module "build_host"
644644
base_configuration = module.base.configuration
645645
646646
name = "buildhost"
647-
image = "sles15sp3o"
647+
image = "sles15sp7o"
648648
}
649649
```
650650

‎modules/controller/main.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,14 @@ module "controller" {
140140
ubuntu2404_sshminion = length(var.ubuntu2404_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2404_sshminion_configuration["hostnames"][0] : null
141141
debian12_minion = length(var.debian12_minion_configuration["hostnames"]) > 0 ? var.debian12_minion_configuration["hostnames"][0] : null
142142
debian12_sshminion = length(var.debian12_sshminion_configuration["hostnames"]) > 0 ? var.debian12_sshminion_configuration["hostnames"][0] : null
143-
sle12sp5_buildhost = length(var.sle12sp5_buildhost_configuration["hostnames"]) > 0 ? var.sle12sp5_buildhost_configuration["hostnames"][0] : null
144-
sle12sp5_terminal_mac = var.sle12sp5_terminal_configuration["private_mac"]
145143
sle15sp3_buildhost = length(var.sle15sp3_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp3_buildhost_configuration["hostnames"][0] : null
146144
sle15sp3_terminal_mac = var.sle15sp3_terminal_configuration["private_mac"]
147145
sle15sp4_buildhost = length(var.sle15sp4_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp4_buildhost_configuration["hostnames"][0] : null
148146
sle15sp4_terminal_mac = var.sle15sp4_terminal_configuration["private_mac"]
147+
sle15sp6_buildhost = length(var.sle15sp6_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp6_buildhost_configuration["hostnames"][0] : null
148+
sle15sp6_terminal_mac = var.sle15sp6_terminal_configuration["private_mac"]
149+
sle15sp7_buildhost = length(var.sle15sp7_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp7_buildhost_configuration["hostnames"][0] : null
150+
sle15sp7_terminal_mac = var.sle15sp7_terminal_configuration["private_mac"]
149151
opensuse155arm_minion = length(var.opensuse155arm_minion_configuration["hostnames"]) > 0 ? var.opensuse155arm_minion_configuration["hostnames"][0] : null
150152
opensuse155arm_sshminion = length(var.opensuse155arm_sshminion_configuration["hostnames"]) > 0 ? var.opensuse155arm_sshminion_configuration["hostnames"][0] : null
151153
opensuse156arm_minion = length(var.opensuse156arm_minion_configuration["hostnames"]) > 0 ? var.opensuse156arm_minion_configuration["hostnames"][0] : null

‎modules/controller/variables.tf‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -568,25 +568,29 @@ variable "debian12_sshminion_configuration" {
568568
}
569569
}
570570

571+
variable "sle15sp3_buildhost_configuration" {
572+
description = "use module.<SLE15SP3_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
573+
default = {
574+
hostnames = []
575+
}
576+
}
577+
571578
variable "sle15sp4_buildhost_configuration" {
572579
description = "use module.<SLE15SP4_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
573580
default = {
574581
hostnames = []
575582
}
576583
}
577584

578-
variable "sle15sp4_terminal_configuration" {
579-
description = "use module.<SLE15SP4_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
585+
variable "sle15sp6_buildhost_configuration" {
586+
description = "use module.<SLE15SP6_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
580587
default = {
581-
private_mac = null
582-
private_ip = null
583-
private_name = null
584-
image = null
588+
hostnames = []
585589
}
586590
}
587591

588-
variable "sle15sp3_buildhost_configuration" {
589-
description = "use module.<SLE15SP3_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
592+
variable "sle15sp7_buildhost_configuration" {
593+
description = "use module.<SLE15SP7_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
590594
default = {
591595
hostnames = []
592596
}
@@ -602,15 +606,28 @@ variable "sle15sp3_terminal_configuration" {
602606
}
603607
}
604608

605-
variable "sle12sp5_buildhost_configuration" {
606-
description = "use module.<SLE12SP5_BUILDHOST>.configuration, see main.tf.libvirt-testsuite.example"
609+
variable "sle15sp4_terminal_configuration" {
610+
description = "use module.<SLE15SP4_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
607611
default = {
608-
hostnames = []
612+
private_mac = null
613+
private_ip = null
614+
private_name = null
615+
image = null
616+
}
617+
}
618+
619+
variable "sle15sp6_terminal_configuration" {
620+
description = "use module.<SLE15SP6_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
621+
default = {
622+
private_mac = null
623+
private_ip = null
624+
private_name = null
625+
image = null
609626
}
610627
}
611628

612-
variable "sle12sp5_terminal_configuration" {
613-
description = "use module.<SLE12SP5_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
629+
variable "sle15sp7_terminal_configuration" {
630+
description = "use module.<SLE15SP7_TERMINAL>.configuration, see main.tf.libvirt-testsuite.example"
614631
default = {
615632
private_mac = null
616633
private_ip = null

‎salt/controller/bashrc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ export BUILD_SOURCES="dist.nue.suse.com"
9797
{% if grains.get('ubuntu2404_sshminion') | default(false, true) %}export UBUNTU2404_SSHMINION="{{ grains.get('ubuntu2404_sshminion') }}" {% else %}# no UBUNTU2404 ssh minion defined {% endif %}
9898
{% if grains.get('debian12_minion') | default(false, true) %}export DEBIAN12_MINION="{{ grains.get('debian12_minion') }}" {% else %}# no DEBIAN12 minion defined {% endif %}
9999
{% if grains.get('debian12_sshminion') | default(false, true) %}export DEBIAN12_SSHMINION="{{ grains.get('debian12_sshminion') }}" {% else %}# no DEBIAN12 ssh minion defined {% endif %}
100-
{% if grains.get('sle15sp4_buildhost') | default(false, true) %}export SLE15SP4_BUILDHOST="{{ grains.get('sle15sp4_buildhost') }}" {% else %}# no SLE15SP4 buildhost defined {% endif %}
101-
{% 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 %}
102100
{% if grains.get('sle15sp3_buildhost') | default(false, true) %}export SLE15SP3_BUILDHOST="{{ grains.get('sle15sp3_buildhost') }}" {% else %}# no SLE15SP3 buildhost defined {% endif %}
103101
{% 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 %}
104-
{% if grains.get('sle12sp5_buildhost') | default(false, true) %}export SLE12SP5_BUILDHOST="{{ grains.get('sle12sp5_buildhost') }}" {% else %}# no SLE12SP5 buildhost defined {% endif %}
105-
{% 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 %}
102+
{% if grains.get('sle15sp4_buildhost') | default(false, true) %}export SLE15SP4_BUILDHOST="{{ grains.get('sle15sp4_buildhost') }}" {% else %}# no SLE15SP4 buildhost defined {% endif %}
103+
{% 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 %}
104+
{% if grains.get('sle15sp6_buildhost') | default(false, true) %}export SLE15SP6_BUILDHOST="{{ grains.get('sle15sp6_buildhost') }}" {% else %}# no SLE15SP6 buildhost defined {% endif %}
105+
{% if grains.get('sle15sp7_buildhost') | default(false, true) %}export SLE15SP7_BUILDHOST="{{ grains.get('sle15sp7_buildhost') }}" {% else %}# no SLE15SP7 buildhost defined {% endif %}
106+
{% 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 %}
107+
{% 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 %}
106108
{% if grains.get('opensuse155arm_minion') | default(false, true) %}export OPENSUSE155ARM_MINION="{{ grains.get('opensuse155arm_minion') }}" {% else %}# no OPENSUSE155ARM minion defined {% endif %}
107109
{% if grains.get('opensuse155arm_sshminion') | default(false, true) %}export OPENSUSE155ARM_SSHMINION="{{ grains.get('opensuse155arm_sshminion') }}" {% else %}# no OPENSUSE155ARM ssh minion defined {% endif %}
108110
{% if grains.get('opensuse156arm_minion') | default(false, true) %}export OPENSUSE156ARM_MINION="{{ grains.get('opensuse156arm_minion') }}" {% else %}# no OPENSUSE156ARM minion defined {% endif %}

0 commit comments

Comments
 (0)