Skip to content

Commit 4757b87

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Pin upper-constraints in CS9 jobs for Py3.9 compatibility"
2 parents b56cd27 + 84ef6e1 commit 4757b87

File tree

3 files changed

+605
-1
lines changed

3 files changed

+605
-1
lines changed

scripts/install-deps.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ case ${ID,,} in
6969
# NOTE(rpittau): epel repos are installed but the content is purged
7070
# in the CI images, we remove them and reinstall later
7171
sudo -E ${PKG_MANAGER} remove -y epel-release epel-next-release
72+
73+
if [[ $NAME == 'CentOS Stream' ]] && [[ $VERSION == 9 ]]; then
74+
export CONSTRAINTS_FILE="$BIFROST_HOME/upper-constraints-cs9-py39.txt"
75+
export UPPER_CONSTRAINTS_FILE=$CONSTRAINTS_FILE
76+
export TOX_CONSTRAINTS_FILE=$CONSTRAINTS_FILE
77+
fi
7278
;;
7379

7480
*) echo "ERROR: Supported package manager not found. Supported: apt, dnf, yum, zypper"; exit 1;;

scripts/test-bifrost.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euxo pipefail
44

55
export PYTHONUNBUFFERED=1
66
SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)"
7-
BIFROST_HOME=$SCRIPT_HOME/..
7+
export BIFROST_HOME=$SCRIPT_HOME/..
88
USE_DHCP="${USE_DHCP:-false}"
99
BUILD_IMAGE="${BUILD_IMAGE:-false}"
1010
BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'}

0 commit comments

Comments
 (0)