Update diskimage-create.sh to set jammy as default Ubuntu version
Change-Id: Ib98d50b7b1c790a180efab1d6626f6db4b3998e1
This commit is contained in:
parent
344d6d76ce
commit
37ddc6fba4
@ -102,7 +102,7 @@ Command syntax:
|
|||||||
[-a i386 | **amd64** | armhf | aarch64 | ppc64le ]
|
[-a i386 | **amd64** | armhf | aarch64 | ppc64le ]
|
||||||
[-b **haproxy** ]
|
[-b **haproxy** ]
|
||||||
[-c **~/.cache/image-create** | <cache directory> ]
|
[-c **~/.cache/image-create** | <cache directory> ]
|
||||||
[-d **focal**/**9-stream**/**9** | <other release id> ]
|
[-d **jammy**/**9-stream**/**9** | <other release id> ]
|
||||||
[-e]
|
[-e]
|
||||||
[-f]
|
[-f]
|
||||||
[-g **repository branch** | stable/train | stable/stein | ... ]
|
[-g **repository branch** | stable/train | stable/stein | ... ]
|
||||||
@ -124,7 +124,7 @@ Command syntax:
|
|||||||
'-a' is the architecture type for the image (default: amd64)
|
'-a' is the architecture type for the image (default: amd64)
|
||||||
'-b' is the backend type (default: haproxy)
|
'-b' is the backend type (default: haproxy)
|
||||||
'-c' is the path to the cache directory (default: ~/.cache/image-create)
|
'-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)
|
'-e' enable complete mandatory access control systems when available (default: permissive)
|
||||||
'-f' disable tmpfs for build
|
'-f' disable tmpfs for build
|
||||||
'-g' build the image for a specific OpenStack Git branch (default: current repository branch)
|
'-g' build the image for a specific OpenStack Git branch (default: current repository branch)
|
||||||
|
@ -23,7 +23,7 @@ usage() {
|
|||||||
echo " [-a i386 | **amd64** | armhf | aarch64 | ppc64le]"
|
echo " [-a i386 | **amd64** | armhf | aarch64 | ppc64le]"
|
||||||
echo " [-b **haproxy** ]"
|
echo " [-b **haproxy** ]"
|
||||||
echo " [-c **~/.cache/image-create** | <cache directory> ]"
|
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 " [-e]"
|
||||||
echo " [-f]"
|
echo " [-f]"
|
||||||
echo " [-g **repository branch** | stable/train | stable/stein | ... ]"
|
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 " '-a' is the architecture type for the image (default: amd64)"
|
||||||
echo " '-b' is the backend type (default: haproxy)"
|
echo " '-b' is the backend type (default: haproxy)"
|
||||||
echo " '-c' is the path to the cache directory (default: ~/.cache/image-create)"
|
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 " '-e' enable complete mandatory access control systems when available (default: permissive)"
|
||||||
echo " '-f' disable tmpfs for build"
|
echo " '-f' disable tmpfs for build"
|
||||||
echo " '-g' build the image for a specific OpenStack Git branch (default: current repository branch)"
|
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"}
|
AMP_BASEOS=${AMP_BASEOS:-"ubuntu-minimal"}
|
||||||
|
|
||||||
if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
|
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
|
elif [ "${AMP_BASEOS}" = "rhel" ]; then
|
||||||
export DIB_RELEASE=${AMP_DIB_RELEASE:-"9"}
|
export DIB_RELEASE=${AMP_DIB_RELEASE:-"9"}
|
||||||
elif [ "${AMP_BASEOS}" = "centos-minimal" ]; then
|
elif [ "${AMP_BASEOS}" = "centos-minimal" ]; then
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
``diskimage-create.sh`` has been updated to build Ubuntu Jammy (22.04)
|
||||||
|
amphora images per default.
|
@ -18,6 +18,16 @@
|
|||||||
amphora_os: ubuntu
|
amphora_os: ubuntu
|
||||||
amphora_os_release: focal
|
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:
|
- job:
|
||||||
name: publish-openstack-octavia-amphora-image-centos-9-stream
|
name: publish-openstack-octavia-amphora-image-centos-9-stream
|
||||||
nodeset: centos-9-stream
|
nodeset: centos-9-stream
|
||||||
|
Loading…
x
Reference in New Issue
Block a user