From 37ddc6fba4c5d216a0088f7e8a8c0baf01f84b64 Mon Sep 17 00:00:00 2001 From: Tom Weininger Date: Thu, 20 Oct 2022 14:24:28 +0200 Subject: [PATCH] Update diskimage-create.sh to set jammy as default Ubuntu version Change-Id: Ib98d50b7b1c790a180efab1d6626f6db4b3998e1 --- diskimage-create/README.rst | 4 ++-- diskimage-create/diskimage-create.sh | 6 +++--- ...mphora-image-default-to-jammy-fad22bfb80a13f2b.yaml | 5 +++++ zuul.d/jobs.yaml | 10 ++++++++++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/update-ubuntu-amphora-image-default-to-jammy-fad22bfb80a13f2b.yaml diff --git a/diskimage-create/README.rst b/diskimage-create/README.rst index 48390aa3af..e25487dc57 100644 --- a/diskimage-create/README.rst +++ b/diskimage-create/README.rst @@ -102,7 +102,7 @@ Command syntax: [-a i386 | **amd64** | armhf | aarch64 | ppc64le ] [-b **haproxy** ] [-c **~/.cache/image-create** | ] - [-d **focal**/**9-stream**/**9** | ] + [-d **jammy**/**9-stream**/**9** | ] [-e] [-f] [-g **repository branch** | stable/train | stable/stein | ... ] @@ -124,7 +124,7 @@ Command syntax: '-a' is the architecture type for the image (default: amd64) '-b' is the backend type (default: haproxy) '-c' is the path to the cache directory (default: ~/.cache/image-create) - '-d' distribution release id (default on ubuntu: focal) + '-d' distribution release id (default on ubuntu: jammy) '-e' enable complete mandatory access control systems when available (default: permissive) '-f' disable tmpfs for build '-g' build the image for a specific OpenStack Git branch (default: current repository branch) diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index dbb165abce..11c66d623d 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -23,7 +23,7 @@ usage() { echo " [-a i386 | **amd64** | armhf | aarch64 | ppc64le]" echo " [-b **haproxy** ]" echo " [-c **~/.cache/image-create** | ]" - echo " [-d **focal**/**9-stream**/**9** | ]" + echo " [-d **jammy**/**9-stream**/**9** | ]" echo " [-e]" echo " [-f]" echo " [-g **repository branch** | stable/train | stable/stein | ... ]" @@ -44,7 +44,7 @@ usage() { echo " '-a' is the architecture type for the image (default: amd64)" echo " '-b' is the backend type (default: haproxy)" echo " '-c' is the path to the cache directory (default: ~/.cache/image-create)" - echo " '-d' distribution release id (default on ubuntu: focal)" + echo " '-d' distribution release id (default on ubuntu: jammy)" echo " '-e' enable complete mandatory access control systems when available (default: permissive)" echo " '-f' disable tmpfs for build" echo " '-g' build the image for a specific OpenStack Git branch (default: current repository branch)" @@ -234,7 +234,7 @@ AMP_CACHEDIR="$( cd "$AMP_CACHEDIR" && pwd )" AMP_BASEOS=${AMP_BASEOS:-"ubuntu-minimal"} if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then - export DIB_RELEASE=${AMP_DIB_RELEASE:-"focal"} + export DIB_RELEASE=${AMP_DIB_RELEASE:-"jammy"} elif [ "${AMP_BASEOS}" = "rhel" ]; then export DIB_RELEASE=${AMP_DIB_RELEASE:-"9"} elif [ "${AMP_BASEOS}" = "centos-minimal" ]; then diff --git a/releasenotes/notes/update-ubuntu-amphora-image-default-to-jammy-fad22bfb80a13f2b.yaml b/releasenotes/notes/update-ubuntu-amphora-image-default-to-jammy-fad22bfb80a13f2b.yaml new file mode 100644 index 0000000000..efe2fb64b7 --- /dev/null +++ b/releasenotes/notes/update-ubuntu-amphora-image-default-to-jammy-fad22bfb80a13f2b.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + ``diskimage-create.sh`` has been updated to build Ubuntu Jammy (22.04) + amphora images per default. diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d7d98080fe..6bceaa81d6 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -18,6 +18,16 @@ amphora_os: ubuntu amphora_os_release: focal +- job: + name: publish-openstack-octavia-amphora-image-jammy + parent: publish-openstack-octavia-amphora-image + nodeset: ubuntu-jammy + description: | + Publish Ubuntu Jammy (22.04) based amphora image to tarballs.o.o. + vars: + amphora_os: ubuntu + amphora_os_release: jammy + - job: name: publish-openstack-octavia-amphora-image-centos-9-stream nodeset: centos-9-stream