openstack/octavia
Code Issues Proposed changes

Allow release id to be specified with fedora

Browse Source 
This resolves the fedora image build failure below:
http://logs.openstack.org/periodic/git.openstack.org/openstack/octavia/ \
master/publish-openstack-octavia-amphora-image-fedora/6be692a/job-output.txt.gz

Change-Id: Ide8ebbc6264afb2f33cf2d6803aaf21631449424
This commit is contained in:
Jacky Hu 2018-12-10 15:50:27 +08:00
parent 5ab8dc42b9
commit f9fd702b20
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,8 @@ if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
export DIB_RELEASE=${AMP_DIB_RELEASE:-"xenial"} export DIB_RELEASE=${AMP_DIB_RELEASE:-"xenial"}
elif [ "${AMP_BASEOS}" = "centos" ] || [ "${AMP_BASEOS}" = "rhel" ]; then elif [ "${AMP_BASEOS}" = "centos" ] || [ "${AMP_BASEOS}" = "rhel" ]; then
export DIB_RELEASE=${AMP_DIB_RELEASE:-"7"} export DIB_RELEASE=${AMP_DIB_RELEASE:-"7"}
elif [ "${AMP_BASEOS}" = "fedora" ]; then
export DIB_RELEASE=${AMP_DIB_RELEASE:-"28"}
fi fi
AMP_OUTPUTFILENAME=${AMP_OUTPUTFILENAME:-"$PWD/amphora-x64-haproxy"} AMP_OUTPUTFILENAME=${AMP_OUTPUTFILENAME:-"$PWD/amphora-x64-haproxy"}

1
zuul.d/jobs.yaml
View File

@ -103,6 +103,7 @@
vars: vars:
amphora_os: fedora amphora_os: fedora
amphora_image_size: 3 amphora_image_size: 3
amphora_os_release: 28
- job: - job:
name: octavia-grenade name: octavia-grenade