From b4724849444add2421f90035d2fa6519282452ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan-Luis=20de=20Sousa-Valadas=20Casta=C3=B1o?= Date: Fri, 29 Nov 2024 12:50:32 +0100 Subject: [PATCH] Update OS tests images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 38 -> 41 Fedora CoreOS 38 -> 41 Ubuntu 23.04 -> 23.10 Signed-off-by: Juan-Luis de Sousa-Valadas Castaño --- .github/workflows/ostests-matrix.yaml | 6 +++--- .github/workflows/ostests-nightly.yaml | 6 +++--- hack/ostests/README.md | 6 +++--- hack/ostests/modules/os/main.tf | 6 +++--- .../modules/os/{os_fcos_38.tf => os_fcos_41.tf} | 14 +++++++------- .../os/{os_fedora_38.tf => os_fedora_41.tf} | 12 ++++++------ .../os/{os_ubuntu_2304.tf => os_ubuntu_2310.tf} | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) rename hack/ostests/modules/os/{os_fcos_38.tf => os_fcos_41.tf} (72%) rename hack/ostests/modules/os/{os_fedora_38.tf => os_fedora_41.tf} (70%) rename hack/ostests/modules/os/{os_ubuntu_2304.tf => os_ubuntu_2310.tf} (72%) diff --git a/.github/workflows/ostests-matrix.yaml b/.github/workflows/ostests-matrix.yaml index a53c24ee63e7..7a4162079fad 100644 --- a/.github/workflows/ostests-matrix.yaml +++ b/.github/workflows/ostests-matrix.yaml @@ -26,13 +26,13 @@ on: "alpine_3_17", "alpine_3_20", "centos_7", "centos_8", "centos_9", "debian_10", "debian_11", "debian_12", - "fcos_38", - "fedora_38", + "fcos_41", + "fedora_41", "flatcar", "oracle_7_9", "oracle_8_7", "oracle_9_1", "rhel_7", "rhel_8", "rhel_9", "rocky_8", "rocky_9", - "ubuntu_2004", "ubuntu_2204", "ubuntu_2304" + "ubuntu_2004", "ubuntu_2204", "ubuntu_2310" ] arch: type: string diff --git a/.github/workflows/ostests-nightly.yaml b/.github/workflows/ostests-nightly.yaml index 839bb01e8309..6ec8f678a5f4 100644 --- a/.github/workflows/ostests-nightly.yaml +++ b/.github/workflows/ostests-nightly.yaml @@ -14,13 +14,13 @@ env: ["alpine_3_17", "alpine_3_20"], ["centos_7", "centos_8", "centos_9"], ["debian_10", "debian_11", "debian_12"], - ["fcos_38"], - ["fedora_38"], + ["fcos_41"], + ["fedora_41"], ["flatcar"], ["oracle_7_9", "oracle_8_7", "oracle_9_1"], ["rhel_7", "rhel_8", "rhel_9"], ["rocky_8", "rocky_9"], - ["ubuntu_2004", "ubuntu_2204", "ubuntu_2304"] + ["ubuntu_2004", "ubuntu_2204", "ubuntu_2310"] ] NETWORK_PROVIDERS: >- [ diff --git a/hack/ostests/README.md b/hack/ostests/README.md index d100af3f3184..8e808c9c3b1c 100644 --- a/hack/ostests/README.md +++ b/hack/ostests/README.md @@ -77,8 +77,8 @@ terraform apply * `debian_10`: Debian GNU/Linux 10 (buster) * `debian_11`: Debian GNU/Linux 11 (bullseye) * `debian_12`: Debian GNU/Linux 12 (bookworm) -* `fcos_38`: Fedora CoreOS 38 -* `fedora_38`: Fedora Linux 38 (Cloud Edition) +* `fcos_41`: Fedora CoreOS 41 +* `fedora_41`: Fedora Linux 41 (Cloud Edition) * `flatcar`: Flatcar Container Linux by Kinvolk * `oracle_7_9`: Oracle Linux Server 7.9 * `oracle_8_7`: Oracle Linux Server 8.7 @@ -90,7 +90,7 @@ terraform apply * `rocky_9`: Rocky Linux 9.2 (Blue Onyx) * `ubuntu_2004`: Ubuntu 20.04 LTS * `ubuntu_2204`: Ubuntu 22.04 LTS -* `ubuntu_2304`: Ubuntu 23.04 +* `ubuntu_2310`: Ubuntu 23.10 ### `arch`: Node architecture diff --git a/hack/ostests/modules/os/main.tf b/hack/ostests/modules/os/main.tf index 0e107672122a..4f618eaf0752 100644 --- a/hack/ostests/modules/os/main.tf +++ b/hack/ostests/modules/os/main.tf @@ -11,8 +11,8 @@ locals { debian_10 = local.os_debian_10 debian_11 = local.os_debian_11 debian_12 = local.os_debian_12 - fcos_38 = local.os_fcos_38 - fedora_38 = local.os_fedora_38 + fcos_41 = local.os_fcos_41 + fedora_41 = local.os_fedora_41 flatcar = local.os_flatcar oracle_7_9 = local.os_oracle_7_9 oracle_8_7 = local.os_oracle_8_7 @@ -24,6 +24,6 @@ locals { rocky_9 = local.os_rocky_9 ubuntu_2004 = local.os_ubuntu_2004 ubuntu_2204 = local.os_ubuntu_2204 - ubuntu_2304 = local.os_ubuntu_2304 + ubuntu_2310 = local.os_ubuntu_2310 } } diff --git a/hack/ostests/modules/os/os_fcos_38.tf b/hack/ostests/modules/os/os_fcos_41.tf similarity index 72% rename from hack/ostests/modules/os/os_fcos_38.tf rename to hack/ostests/modules/os/os_fcos_41.tf index 34ee24f788f8..d90b229c5135 100644 --- a/hack/ostests/modules/os/os_fcos_38.tf +++ b/hack/ostests/modules/os/os_fcos_41.tf @@ -1,15 +1,15 @@ # https://docs.fedoraproject.org/en-US/fedora-coreos/provisioning-aws/ -data "aws_ami" "fcos_38" { - count = var.os == "fcos_38" ? 1 : 0 +data "aws_ami" "fcos_41" { + count = var.os == "fcos_41" ? 1 : 0 owners = ["125523088429"] - name_regex = "^fedora-coreos-38\\.\\d+\\..+-x86_64" + name_regex = "^fedora-coreos-41\\.\\d+\\..+-x86_64" most_recent = true filter { name = "name" - values = ["fedora-coreos-38.*.*-x86_64"] + values = ["fedora-coreos-41.*.*-x86_64"] } filter { @@ -30,16 +30,16 @@ data "aws_ami" "fcos_38" { lifecycle { precondition { condition = var.arch == "x86_64" - error_message = "Unsupported architecture for Fedora CoreOS 38." + error_message = "Unsupported architecture for Fedora CoreOS 41." } } } locals { - os_fcos_38 = var.os != "fcos_38" ? {} : { + os_fcos_41 = var.os != "fcos_41" ? {} : { node_configs = { default = { - ami_id = one(data.aws_ami.fcos_38.*.id) + ami_id = one(data.aws_ami.fcos_41.*.id) connection = { type = "ssh" diff --git a/hack/ostests/modules/os/os_fedora_38.tf b/hack/ostests/modules/os/os_fedora_41.tf similarity index 70% rename from hack/ostests/modules/os/os_fedora_38.tf rename to hack/ostests/modules/os/os_fedora_41.tf index d79cd8012372..231b22df5b59 100644 --- a/hack/ostests/modules/os/os_fedora_38.tf +++ b/hack/ostests/modules/os/os_fedora_41.tf @@ -1,15 +1,15 @@ # https://alt.fedoraproject.org/cloud/ -data "aws_ami" "fedora_38" { - count = var.os == "fedora_38" ? 1 : 0 +data "aws_ami" "fedora_41" { + count = var.os == "fedora_41" ? 1 : 0 owners = ["125523088429"] - name_regex = "^Fedora-Cloud-Base-38-.+\\.x86_64-hvm-" + name_regex = "^Fedora-Cloud-Base-AmazonEC2.x86_64-41-" most_recent = true filter { name = "name" - values = ["Fedora-Cloud-Base-38-*.x86_64-hvm-*"] + values = ["Fedora-Cloud-Base-AmazonEC2.x86_64-41-*"] } filter { @@ -36,10 +36,10 @@ data "aws_ami" "fedora_38" { } locals { - os_fedora_38 = var.os != "fedora_38" ? {} : { + os_fedora_41 = var.os != "fedora_41" ? {} : { node_configs = { default = { - ami_id = one(data.aws_ami.fedora_38.*.id) + ami_id = one(data.aws_ami.fedora_41.*.id) connection = { type = "ssh" diff --git a/hack/ostests/modules/os/os_ubuntu_2304.tf b/hack/ostests/modules/os/os_ubuntu_2310.tf similarity index 72% rename from hack/ostests/modules/os/os_ubuntu_2304.tf rename to hack/ostests/modules/os/os_ubuntu_2310.tf index 07e497efcaef..cd6cf2d5acc4 100644 --- a/hack/ostests/modules/os/os_ubuntu_2304.tf +++ b/hack/ostests/modules/os/os_ubuntu_2310.tf @@ -1,15 +1,15 @@ # https://ubuntu.com/server/docs/cloud-images/amazon-ec2 -data "aws_ami" "ubuntu_2304" { - count = var.os == "ubuntu_2304" ? 1 : 0 +data "aws_ami" "ubuntu_2310" { + count = var.os == "ubuntu_2310" ? 1 : 0 owners = ["099720109477"] - name_regex = "ubuntu/images/hvm-ssd/ubuntu-lunar-23.04-amd64-server-\\d+" + name_regex = "^ubuntu/images/hvm-ssd-gp3/ubuntu-mantic-23.10-amd64-server-\\d+" most_recent = true filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-lunar-23.04-amd64-server-*"] + values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-mantic-23.10-amd64-server-*"] } filter { @@ -36,10 +36,10 @@ data "aws_ami" "ubuntu_2304" { } locals { - os_ubuntu_2304 = var.os != "ubuntu_2304" ? {} : { + os_ubuntu_2310 = var.os != "ubuntu_2310" ? {} : { node_configs = { default = { - ami_id = one(data.aws_ami.ubuntu_2304.*.id) + ami_id = one(data.aws_ami.ubuntu_2310.*.id) user_data = format("#cloud-config\n%s", jsonencode({ runcmd = [