Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 improve upper constraints handling #589

Open
wants to merge 1 commit into
base: release-24.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ ARG PATCH_LIST
ARG INSTALL_TYPE=source

# build arguments for source build customization
ARG UPPER_CONSTRAINTS_FILE
ARG IRONIC_SOURCE=bugfix/24.0
ARG IRONIC_INSPECTOR_SOURCE=bugfix/12.0
ARG UPPER_CONSTRAINTS_FILE=upper-constraints.txt
ARG IRONIC_LIB_SOURCE
ARG SUSHY_SOURCE

Expand Down
2 changes: 1 addition & 1 deletion prepare-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [[ "$INSTALL_TYPE" == "source" ]]; then

# NOTE(elfosardo): if the content of the upper-constraints file is empty,
# we give as assumed that we're on the master branch
if [[ ! -f "${UPPER_CONSTRAINTS_PATH}" ]]; then
if [[ ! -s "${UPPER_CONSTRAINTS_PATH}" ]]; then
UPPER_CONSTRAINTS_PATH="/tmp/upper-constraints.txt"
curl -L https://releases.openstack.org/constraints/upper/master -o "${UPPER_CONSTRAINTS_PATH}"
fi
Expand Down
2 changes: 1 addition & 1 deletion upper-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ idna===3.4
yamlloader===1.2.2
protobuf===4.22.3
pyhcl===0.4.4
sushy===4.5.2
sushy===4.7.0
python-neutronclient===11.0.0
pika===1.3.1
oslo.cache===3.5.0
Expand Down