Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove openSUSE Leap 15.4 due to EOL #1686

Closed
wants to merge 3 commits into from
Closed

Remove openSUSE Leap 15.4 due to EOL #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dcdbb9
Remove openSUSE Leap 15.4 due to EOL
nodeg Sep 9, 2024
adf24e5
Address suggestions
nodeg Sep 11, 2024
e0a395b
Address suggestions part 2
nodeg Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ module "base" {
images = [
"centos7o",
"almalinux8o",
"opensuse154o",
"opensuse155o",
"sles15sp4o",
"sles15sp5o",
Expand Down
4 changes: 0 additions & 4 deletions backend_modules/libvirt/base/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions backend_modules/libvirt/host/user_data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend_modules/null/base/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion backend_modules/null/host/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions main.tf.libvirt-testsuite.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -91,7 +91,7 @@ module "cucumber_testsuite" {
}
server_containerized = {
name = "server"

# Uncomment to run the container on k3s rather than podman
# runtime = "k3s"

Expand Down Expand Up @@ -132,7 +132,7 @@ module "cucumber_testsuite" {
name = "pxeboot"
}
kvm-host = {
image = "opensuse154o"
image = "opensuse156o"
name = "kvmhost"
}
monitoring-server = {
Expand Down
6 changes: 3 additions & 3 deletions main.tf.libvirt-testsuite.example.Manager-43
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-"
Expand Down Expand Up @@ -120,7 +120,7 @@ module "cucumber_testsuite" {
name = "pxeboot"
}
kvm-host = {
image = "opensuse154o"
image = "opensuse156o"
name = "kvmhost"
}
monitoring-server = {
Expand Down
14 changes: 0 additions & 14 deletions modules/controller/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,20 +585,6 @@ variable "sle12sp5_terminal_configuration" {
}
}

variable "opensuse154arm_minion_configuration" {
description = "use module.<OPENSUSE154ARM_MINION>.configuration, see main.tf.libvirt-testsuite.example"
default = {
hostnames = []
}
}

variable "opensuse154arm_sshminion_configuration" {
description = "use module.<OPENSUSE154ARM_SSHMINION>.configuration, see main.tf.libvirt-testsuite.example"
default = {
hostnames = []
}
}

variable "opensuse155arm_minion_configuration" {
description = "use module.<OPENSUSE155ARM_MINION>.configuration, see main.tf.libvirt-testsuite.example"
default = {
Expand Down
6 changes: 3 additions & 3 deletions modules/virthost/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions salt/controller/bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Loading