Skip to content

Commit

Permalink
[cirrus] Update images, add noble to supported list
Browse files Browse the repository at this point in the history
Update the ubuntu images to the newest available

Signed-off-by: Arif Ali <arif.ali@canonical.com>
  • Loading branch information
arif-ali authored and TurboTurtle committed Apr 27, 2024
1 parent d65e135 commit 0ca16e7
Showing 1 changed file with 24 additions and 17 deletions.
41 changes: 24 additions & 17 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ env:

DEBIAN_NAME: "debian-11"

UBUNTU_LATEST_NAME: "ubuntu-23.10"
UBUNTU_NAME: "ubuntu-22.04"
UBUNTU_PRIOR_NAME: "ubuntu-20.04"
UBUNTU_PRIOR2_NAME: "ubuntu-18.04"
UBUNTU_LATEST_NAME: "ubuntu-24.04"
UBUNTU_NAME: "ubuntu-24.04"
UBUNTU_PRIOR_NAME: "ubuntu-22.04"
UBUNTU_PRIOR2_NAME: "ubuntu-20.04"
UBUNTU_PRIOR3_NAME: "ubuntu-18.04"

CENTOS_9_NAME: "centos-stream-9"
CENTOS_8_NAME: "centos-stream-8"
Expand All @@ -30,12 +31,13 @@ env:
FEDORA_IMAGE_NAME: "fedora-cloud-base-gcp-38-1-6-x86-64"
FEDORA_PRIOR_IMAGE_NAME: "fedora-cloud-base-gcp-37-1-7-x86-64"

UBUNTU_DEB_IMAGE_NAME: "ubuntu-minimal-2310-mantic-amd64-v20231030"
UBUNTU_LATEST_IMAGE_NAME: "ubuntu-2310-mantic-amd64-v20231031"
UBUNTU_IMAGE_NAME: "ubuntu-2204-jammy-v20231030"
UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2004-focal-v20231101"
UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-1804-bionic-v20230605"
UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20231030"
UBUNTU_DEB_IMAGE_NAME: "ubuntu-minimal-2404-noble-amd64-v20240423"
UBUNTU_LATEST_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423"
UBUNTU_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423"
UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240319"
UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20240307b"
UBUNTU_PRIOR3_IMAGE_NAME: "ubuntu-1804-bionic-v20240116a"
UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20240319"
UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2404-lts-amd64"

# Curl-command prefix for downloading task artifacts, simply add the
Expand Down Expand Up @@ -195,25 +197,30 @@ report_stageone_task:
- env: *fedora
- env: *fedoraprior
- env: &ubuntu
PKG: "snap"
PROJECT: ${UBUNTU_PROJECT}
BUILD_NAME: ${UBUNTU_NAME}
BUILD_NAME: "${UBUNTU_NAME} - ${PKG}"
VM_IMAGE_NAME: ${UBUNTU_IMAGE_NAME}
PKG: "snap"
- env: &ubuntuprior
PKG: "snap"
PROJECT: ${UBUNTU_PROJECT}
BUILD_NAME: ${UBUNTU_PRIOR_NAME}
BUILD_NAME: "${UBUNTU_PRIOR_NAME} - ${PKG}"
VM_IMAGE_NAME: ${UBUNTU_PRIOR_IMAGE_NAME}
PKG: "snap"
- env: &ubuntuprior2
PKG: "snap"
PROJECT: ${UBUNTU_PROJECT}
BUILD_NAME: ${UBUNTU_PRIOR2_NAME}
BUILD_NAME: "${UBUNTU_PRIOR2_NAME} - ${PKG}"
VM_IMAGE_NAME: ${UBUNTU_PRIOR2_IMAGE_NAME}
- env: &ubuntuprior3
PKG: "snap"
PROJECT: ${UBUNTU_PROJECT}
BUILD_NAME: "${UBUNTU_PRIOR3_NAME} - ${PKG}"
VM_IMAGE_NAME: ${UBUNTU_PRIOR3_IMAGE_NAME}
- env: &ubuntu-latest
PKG: "deb"
PROJECT: ${UBUNTU_PROJECT}
BUILD_NAME: ${UBUNTU_LATEST_NAME}
BUILD_NAME: "${UBUNTU_LATEST_NAME} - ${PKG}"
VM_IMAGE_NAME: ${UBUNTU_LATEST_IMAGE_NAME}
PKG: "deb"
setup_script: &setup |
if [ $(command -v apt) ]; then
apt -y purge sosreport
Expand Down

0 comments on commit 0ca16e7

Please sign in to comment.