diff --git a/README.md b/README.md index 48219895d..898085283 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,6 @@ module "base" { images = [ "centos7o", "almalinux8o", - "opensuse154o", "opensuse155o", "sles15sp4o", "sles15sp5o", diff --git a/backend_modules/libvirt/base/main.tf b/backend_modules/libvirt/base/main.tf index dd9adec1b..04abe6fff 100644 --- a/backend_modules/libvirt/base/main.tf +++ b/backend_modules/libvirt/base/main.tf @@ -14,10 +14,8 @@ locals { oraclelinux9o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://yum.oracle.com"}/templates/OracleLinux/OL9/u0/x86_64/OL9U0_x86_64-kvm-b142.qcow" rocky8o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.rockylinux.org"}/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2" rocky9o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.rockylinux.org"}/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2" - opensuse154o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-Minimal-VM.x86_64-OpenStack-Cloud.qcow2" opensuse155o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2" opensuse156o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.x86_64-Cloud.qcow2" - opensuse154armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-ARM-JeOS-efi.aarch64.qcow2" opensuse155armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.aarch64-Cloud.qcow2" opensuse156armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.aarch64-Cloud.qcow2" sles15sp2 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15sp2.x86_64.qcow2" @@ -31,8 +29,6 @@ locals { ubuntu2204o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud-images.ubuntu.com"}/jammy/current/jammy-server-cloudimg-amd64.img" debian11o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud.debian.org"}/images/cloud/bullseye/latest/debian-11-genericcloud-amd64.qcow2" debian12o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud.debian.org"}/images/cloud/bookworm/latest/debian-12-genericcloud-amd64.qcow2" - opensuse154-ci-pro = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/libvirt/images/opensuse154-ci-pr.x86_64.qcow2" - opensuse154-ci-pr-client = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/libvirt/images/opensuse154-ci-pr-client.x86_64.qcow2" opensuse155-ci-pro = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/libvirt/images/opensuse155-ci-pr.x86_64.qcow2" slemicro51-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_51/SUSE-MicroOS.x86_64-sumaform.qcow2" 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" diff --git a/backend_modules/libvirt/host/user_data.yaml b/backend_modules/libvirt/host/user_data.yaml index 7f4b8a557..412220bd3 100644 --- a/backend_modules/libvirt/host/user_data.yaml +++ b/backend_modules/libvirt/host/user_data.yaml @@ -134,7 +134,7 @@ packages: ["salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"] %{ endif } %{ endif } -%{ if image == "opensuse154o" || image == "opensuse154-ci-pro" || image == "opensuse154-ci-pr-client" || image == "opensuse155o" || image == "opensuse156o" || image == "opensuse155-ci-pro"} +%{ if image == "opensuse155o" || image == "opensuse156o" || image == "opensuse155-ci-pro"} zypper: repos: - id: tools_pool_repo @@ -815,7 +815,7 @@ packages: ["avahi", "nss-mdns", "qemu-guest-agent", "salt-minion", "dbus-tools", %{ endif } -%{ if image == "opensuse154armo" || image == "opensuse155armo" || image == "opensuse156armo" } +%{ if image == "opensuse155armo" || image == "opensuse156armo" } zypper: repos: - id: tools_pool_repo diff --git a/backend_modules/null/base/variables.tf b/backend_modules/null/base/variables.tf index 7b5f8e270..f6f661e25 100644 --- a/backend_modules/null/base/variables.tf +++ b/backend_modules/null/base/variables.tf @@ -67,7 +67,7 @@ variable "provider_settings" { variable "images" { description = "list of images to be uploaded to the libvirt host, leave default for all" - default = [ "almalinux8o", "almalinux9o", "amazonlinux2o", "centos7o", "libertylinux9o", "opensuse154o", "opensuse155o", "tumbleweedo", "oraclelinux9o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o"] + default = [ "almalinux8o", "almalinux9o", "amazonlinux2o", "centos7o", "libertylinux9o", "opensuse155o", "opensuse156o", "tumbleweedo", "oraclelinux9o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o"] type = set(string) } diff --git a/backend_modules/null/host/variables.tf b/backend_modules/null/host/variables.tf index 2ef8e26a6..4e00b015d 100644 --- a/backend_modules/null/host/variables.tf +++ b/backend_modules/null/host/variables.tf @@ -91,7 +91,7 @@ variable "connect_to_additional_network" { } variable "image" { - description = "An image name, e.g. sles12sp4 or opensuse154o" + description = "An image name, e.g. sles12sp4 or opensuse156o" type = string } diff --git a/main.tf.libvirt-testsuite.example b/main.tf.libvirt-testsuite.example index 7124b720f..7e61308b5 100644 --- a/main.tf.libvirt-testsuite.example +++ b/main.tf.libvirt-testsuite.example @@ -34,7 +34,7 @@ module "cucumber_testsuite" { # "amazonlinux2o", # "centos7o", "centos8o", "centos9o", # "libertylinux9o", - # "opensuse154o", "opensuse155o", + # "opensuse155o", "opensuse156o", # "oraclelinux9o", # "rocky8o", "rocky9o", # "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", @@ -91,7 +91,7 @@ module "cucumber_testsuite" { } server_containerized = { name = "server" - + # Uncomment to run the container on k3s rather than podman # runtime = "k3s" @@ -132,7 +132,7 @@ module "cucumber_testsuite" { name = "pxeboot" } kvm-host = { - image = "opensuse154o" + image = "opensuse156o" name = "kvmhost" } monitoring-server = { diff --git a/main.tf.libvirt-testsuite.example.Manager-43 b/main.tf.libvirt-testsuite.example.Manager-43 index f078209e3..f8de11d67 100644 --- a/main.tf.libvirt-testsuite.example.Manager-43 +++ b/main.tf.libvirt-testsuite.example.Manager-43 @@ -34,14 +34,14 @@ module "cucumber_testsuite" { # "amazonlinux2o", # "centos7o", "centos8o", "centos9o", # "libertylinux9o", - # "opensuse154o", "opensuse155o", + # "opensuse155o", "opensuse156o", # "oraclelinux9o", # "rocky8o", "rocky9o", # "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", # "ubuntu2004o", "ubuntu2204o" # to see what VM uses what image, have a look at the image variable in the cucumber_module definition # https://github.com/uyuni-project/sumaform/blob/master/modules/cucumber_testsuite/main.tf - images = ["rocky9o", "opensuse154o", "sles15sp4o", "ubuntu2204o"] + images = ["rocky9o", "opensuse156o", "sles15sp4o", "ubuntu2204o"] use_avahi = true name_prefix = "prefix-" @@ -120,7 +120,7 @@ module "cucumber_testsuite" { name = "pxeboot" } kvm-host = { - image = "opensuse154o" + image = "opensuse156o" name = "kvmhost" } monitoring-server = { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index c758d8c78..56cc3e4e4 100644 --- a/modules/controller/variables.tf +++ b/modules/controller/variables.tf @@ -585,20 +585,6 @@ variable "sle12sp5_terminal_configuration" { } } -variable "opensuse154arm_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "opensuse154arm_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - variable "opensuse155arm_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { diff --git a/modules/virthost/variables.tf b/modules/virthost/variables.tf index 73fc38933..26a15f6df 100644 --- a/modules/virthost/variables.tf +++ b/modules/virthost/variables.tf @@ -79,9 +79,9 @@ variable "hvm_disk_image" { type = map(map(string)) default = { leap = { - hostname = "leap154" - image = "https://download.opensuse.org/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-Minimal-VM.x86_64-OpenStack-Cloud.qcow2" - hash = "https://download.opensuse.org/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-Minimal-VM.x86_64-OpenStack-Cloud.qcow2.sha256" + hostname = "leap156" + image = "https://download.opensuse.org/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.x86_64-kvm-and-xen.qcow2" + hash = "https://download.opensuse.org/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.x86_64-kvm-and-xen.qcow2.sha256" } } } diff --git a/salt/controller/bashrc b/salt/controller/bashrc index ae9ae86fc..acafc0015 100644 --- a/salt/controller/bashrc +++ b/salt/controller/bashrc @@ -88,8 +88,6 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host 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('opensuse154arm_minion') | default(false, true) %}export OPENSUSE154ARM_MINION="{{ grains.get('opensuse154arm_minion') }}" {% else %}# no OPENSUSE154ARM minion defined {% endif %} -{% if grains.get('opensuse154arm_sshminion') | default(false, true) %}export OPENSUSE154ARM_SSHMINION="{{ grains.get('opensuse154arm_sshminion') }}" {% else %}# no OPENSUSE154ARM ssh minion 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 %}