Update branch checkout for octavia-lib DIB element
Octavia has a diskimage-builder element to install octavia-lib. When creating an amphora image from an Octavia stable branch, the expectation is the octavia-lib code will match the same branch (master or stable). This patch updates the branch name and upper constraints for octavia-lib in Octavia on stable branch creation. This change is in line with I8eba64c886c187c8652f94735ca6153702203d17. Depends-On: https://review.opendev.org/#/c/745506 Change-Id: I31b762f631304636bafabec9c54cd31c6c91f124
This commit is contained in:
parent
25dacf963d
commit
742ba18990
@ -93,11 +93,17 @@ function update_upper_constraints {
|
||||
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 [[ -f elements/octavia-lib/source-repository-octavia-lib ]]; then
|
||||
sed -i~ -e "s,\(https://opendev.org/openstack/octavia-lib\).*,\1 ${branch}," elements/octavia-lib/source-repository-octavia-lib
|
||||
fi
|
||||
if ! git diff --exit-code >/dev/null 2>&1 ; then
|
||||
git add tox.ini
|
||||
if [[ -f elements/amphora-agent/source-repository-amphora-agent ]]; then
|
||||
git add elements/amphora-agent/source-repository-amphora-agent
|
||||
fi
|
||||
if [[ -f elements/octavia-lib/source-repository-octavia-lib ]]; then
|
||||
git add elements/octavia-lib/source-repository-octavia-lib
|
||||
fi
|
||||
msg="Update TOX_CONSTRAINTS_FILE for $branch"
|
||||
body="Update the URL to the upper-constraints file to point to the redirect
|
||||
rule on releases.openstack.org so that anyone working on this branch
|
||||
|
Loading…
Reference in New Issue
Block a user