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

Update OS tests images #5302

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update OS tests images #5302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/ostests-matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ostests-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
[
Expand Down
6 changes: 3 additions & 3 deletions hack/ostests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions hack/ostests/modules/os/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
}
14 changes: 7 additions & 7 deletions hack/ostests/modules/os/os_fcos_38.tf → hack/ostests/modules/os/os_fcos_41.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions hack/ostests/modules/os/os_fedora_38.tf → hack/ostests/modules/os/os_fedora_41.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions hack/ostests/modules/os/os_ubuntu_2304.tf → hack/ostests/modules/os/os_ubuntu_2310.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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 = [
Expand Down
Loading