openstack/devstack
Code Issues Proposed changes

Merge "Set GLOBAL_VENV to false for centos and rocky"

Browse Source
This commit is contained in:
Zuul 2023-08-23 19:42:43 +00:00 committed by Gerrit Code Review
commit 640c318f38
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.zuul.yaml
View File

@ -708,9 +708,6 @@
nodeset: devstack-single-node-centos-9-stream nodeset: devstack-single-node-centos-9-stream
timeout: 9000 timeout: 9000
voting: false voting: false
vars:
devstack_localrc:
GLOBAL_VENV: false
- job: - job:
name: devstack-platform-debian-bookworm name: devstack-platform-debian-bookworm
@ -745,8 +742,6 @@
timeout: 9000 timeout: 9000
vars: vars:
configure_swap_size: 4096 configure_swap_size: 4096
devstack_localrc:
GLOBAL_VENV: false
- job: - job:
name: devstack-platform-ubuntu-focal name: devstack-platform-ubuntu-focal

11
stackrc
View File

@ -188,9 +188,18 @@ ENFORCE_SCOPE=$(trueorfalse False ENFORCE_SCOPE)
# Note that the DATA_DIR is selected because grenade testing uses a shared # Note that the DATA_DIR is selected because grenade testing uses a shared
# DATA_DIR but different DEST dirs and we don't want two sets of venvs, # DATA_DIR but different DEST dirs and we don't want two sets of venvs,
# instead we want one global set. # instead we want one global set.
GLOBAL_VENV=$(trueorfalse True GLOBAL_VENV)
DEVSTACK_VENV=${DEVSTACK_VENV:-$DATA_DIR/venv} DEVSTACK_VENV=${DEVSTACK_VENV:-$DATA_DIR/venv}
# NOTE(kopecmartin): remove this once this is fixed
# https://bugs.launchpad.net/devstack/+bug/2031639
# This couldn't go to fixup_stuff as that's called after projects
# (e.g. certain paths) are set taking GLOBAL_VENV into account
if [[ "$os_VENDOR" =~ (CentOSStream|Rocky) ]]; then
GLOBAL_VENV=$(trueorfalse False GLOBAL_VENV)
else
GLOBAL_VENV=$(trueorfalse True GLOBAL_VENV)
fi
# Enable use of Python virtual environments. Individual project use of # Enable use of Python virtual environments. Individual project use of
# venvs are controlled by the PROJECT_VENV array; every project with # venvs are controlled by the PROJECT_VENV array; every project with
# an entry in the array will be installed into the named venv. # an entry in the array will be installed into the named venv.