openstack
/
project-config
Code Issues Proposed changes

Update branch checkout and u-c.txt for Octavia 

Octavia has a diskimage-builder element to install the amphora-agent.
When creating an amphora image from an Octavia stable branch, the
expectation is the amphora-agent code will match the same branch (master
or stable). However, the amphora-agent always pulls master versions of
upper-constraints.txt and of the Octavia Git repository.

This patch updates the branch name and upper constraints for the
amphora-agent in Octavia on stable branch creation.

Change-Id: I8eba64c886c187c8652f94735ca6153702203d17
This commit is contained in:
Carlos Goncalves 2020-02-05 18:54:42 +01:00
parent 2a6570399c
commit d9f9733676
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/copy-release-tools-scripts/files/release-tools/functions
View File

@ -88,6 +88,11 @@ function update_upper_constraints {
fi
sed -i~ -e "s,{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini
sed -i~ -e "s,{\(env:TOX_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini
# Octavia project specific
if [[ -f elements/amphora-agent/source-repository-amphora-agent ]]; then
sed -i~ -e "s,\(https://opendev.org/openstack/octavia\).*,\1 ${branch}," elements/amphora-agent/source-repository-amphora-agent
sed -i~ -e "s,\(file /opt/upper-constraints.txt\) \(.*\),\1 ${uc_url}," elements/amphora-agent/source-repository-amphora-agent
fi
if ! git diff --exit-code >/dev/null 2>&1 ; then
git add tox.ini
msg="Update TOX/UPPER_CONSTRAINTS_FILE for $branch"