openstack/octavia
Code Issues Proposed changes

Merge "Update diskimage-create.sh to set jammy as default Ubuntu version"

Browse Source
This commit is contained in:
Zuul 2023-02-13 13:02:28 +00:00 committed by Gerrit Code Review
commit cf827f5a8a
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage-create/README.rst
View File

@ -102,7 +102,7 @@ Command syntax:
[-a **amd64** | armhf | aarch64 | ppc64le ]
[-b **haproxy** ]
[-c **~/.cache/image-create** | <cache directory> ]
[-d **focal**/**9-stream**/**9** | <other release id> ]
[-d **jammy**/**9-stream**/**9** | <other release id> ]
[-e]
[-f]
[-g **repository branch** | stable/train | stable/stein | ... ]
@ -125,7 +125,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)

6
diskimage-create/diskimage-create.sh
View File

@ -23,7 +23,7 @@ usage() {
echo " [-a **amd64** | armhf | aarch64 | ppc64le]"
echo " [-b **haproxy** ]"
echo " [-c **~/.cache/image-create** | <cache directory> ]"
echo " [-d **focal**/**9-stream**/**9** | <other release id> ]"
echo " [-d **jammy**/**9-stream**/**9** | <other release id> ]"
echo " [-e]"
echo " [-f]"
echo " [-g **repository branch** | stable/train | stable/stein | ... ]"
@ -45,7 +45,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)"
@ -238,7 +238,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

5
releasenotes/notes/update-ubuntu-amphora-image-default-to-jammy-fad22bfb80a13f2b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
``diskimage-create.sh`` has been updated to build Ubuntu Jammy (22.04)
amphora images per default.

10
zuul.d/jobs.yaml
View File

@ -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