Skip to content

Commit 77ada2d

Browse files
authored
[tests] bump devstack branch to stable/2023.2, fix python issues (#2716)
1 parent 5ed0a04 commit 77ada2d

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

tests/playbooks/roles/install-devstack/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
user: "stack"
33
workdir: "/home/{{ user }}/devstack"
4-
branch: "stable/2023.1"
4+
branch: "stable/2023.2"
55
enable_services:
66
- nova
77
- glance

tests/playbooks/roles/install-devstack/tasks/main.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,6 @@
9797
src: local.conf.j2
9898
dest: "{{ workdir }}/local.conf"
9999

100-
- name: Fix localhost
101-
shell:
102-
executable: /bin/bash
103-
cmd: |
104-
# https://bugs.launchpad.net/devstack/+bug/1891694
105-
rm -rf /usr/lib/python3/dist-packages/PyYAML-*.egg-info
106-
# https://bugs.launchpad.net/devstack/+bug/1906322
107-
sed -i 's|$cmd_pip $upgrade |$cmd_pip $upgrade --ignore-installed |g' {{ workdir }}/inc/python
108-
python3 -m pip install --upgrade pip==23.0
109-
python3 -m pip install --upgrade keystoneauth1==5.1.1
110-
python3 -m pip install --upgrade setuptools
111-
python3 -m pip install --upgrade python-debian
112-
python3 -m pip install --upgrade distro-info
113-
python3 -m pip install --upgrade SecretStorage
114-
115100
- name: Change devstack directory owner
116101
file:
117102
path: "{{ item }}"

tests/playbooks/roles/install-devstack/templates/local.conf.j2

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,15 @@ MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_s
122122
MANILA_CONFIGURE_DEFAULT_TYPES=True
123123
{% endif %}
124124

125+
# Add a pre-install script to upgrade pip and setuptools
126+
[[local|pre-install]]
127+
# Activate the virtual environment and upgrade pip and setuptools
128+
if [ -f /opt/stack/data/venv/bin/activate ]; then
129+
source /opt/stack/data/venv/bin/activate
130+
pip install --upgrade pip setuptools
131+
deactivate
132+
fi
133+
125134
{% if "glance" in enable_services %}
126135
[[post-config|$GLANCE_API_CONF]]
127136
[glance_store]

0 commit comments

Comments
 (0)