diff --git a/platforms.json b/platforms.json index 30c57c4..6d945cd 100644 --- a/platforms.json +++ b/platforms.json @@ -94,9 +94,6 @@ "ubuntu-24.04-aarch64", "ubuntu-24.04-amd64", "ubuntu-24.04-armhf", - "ubuntu-25.04-amd64", - "ubuntu-25.04-aarch64", - "ubuntu-25.04-armhf", "ubuntu-26.04-amd64", "ubuntu-26.04-aarch64", "ubuntu-26.04-armhf", @@ -105,7 +102,6 @@ "ezbake-deb": [ "ubuntu-22.04", "ubuntu-24.04", - "ubuntu-25.04", "ubuntu-26.04", "debian-12", "debian-13" diff --git a/scripts/project-config.sh b/scripts/project-config.sh index 3086df0..e12299a 100755 --- a/scripts/project-config.sh +++ b/scripts/project-config.sh @@ -41,8 +41,8 @@ project_defaults="${script_dir}/project_defaults.json" # The universe of OSes nested_vms can actually provision. The derived matrix is # always a subset of this, so build targets we cannot stand up as VMs (e.g. 8.x -# el-7 -> alma/rocky 7 or ubuntu-25.04, and non-VM families like sles, fedora, -# amazon, macos and windows) never leak into the matrix. +# el-7 -> alma/rocky 7, and non-VM families like sles, fedora, amazon, macos +# and windows) never leak into the matrix. universe='[ ["almalinux","8"],["almalinux","9"],["almalinux","10"], ["debian","11"],["debian","12"],["debian","13"],