Zuul: do not use USE_PYTHON3
Devstack has removed the USE_PYTHON3 variable[1][2] and now always uses Python 3. [1] https://review.opendev.org/c/openstack/devstack/+/920658 [2] Commit 5412dbfe7b797149f1f68100de8003b1876398fe Change-Id: I7aaa9bc7865fbaf4be9cee1a2fb5aac9e0036ecd
This commit is contained in:
@@ -23,7 +23,6 @@
|
|||||||
KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
|
KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
|
||||||
ZUN_DRIVER: docker
|
ZUN_DRIVER: docker
|
||||||
ZUN_DB_TYPE: sql
|
ZUN_DB_TYPE: sql
|
||||||
USE_PYTHON3: true
|
|
||||||
ENABLE_CONTAINERD_CRI: true
|
ENABLE_CONTAINERD_CRI: true
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
test-config:
|
test-config:
|
||||||
@@ -59,21 +58,17 @@
|
|||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
|
KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
|
||||||
USE_PYTHON3: true
|
|
||||||
group-vars:
|
group-vars:
|
||||||
subnode:
|
subnode:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
|
KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
|
||||||
KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
|
KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
|
||||||
USE_PYTHON3: true
|
|
||||||
ENABLE_CONTAINERD_CRI: true
|
ENABLE_CONTAINERD_CRI: true
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zun-tempest-py3-docker-sql
|
name: zun-tempest-py3-docker-sql
|
||||||
parent: zun-tempest-base
|
parent: zun-tempest-base
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
|
||||||
USE_PYTHON3: true
|
|
||||||
devstack_services:
|
devstack_services:
|
||||||
s-account: false
|
s-account: false
|
||||||
s-object: false
|
s-object: false
|
||||||
@@ -113,8 +108,6 @@
|
|||||||
name: zun-tempest-docker-sql-standalone
|
name: zun-tempest-docker-sql-standalone
|
||||||
parent: zun-tempest-base
|
parent: zun-tempest-base
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
|
||||||
USE_PYTHON3: true
|
|
||||||
devstack_services:
|
devstack_services:
|
||||||
# disable Nova services
|
# disable Nova services
|
||||||
n-api: false
|
n-api: false
|
||||||
@@ -145,8 +138,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: fullstack
|
tox_envlist: fullstack
|
||||||
tox_install_siblings: false
|
tox_install_siblings: false
|
||||||
devstack_localrc:
|
|
||||||
USE_PYTHON3: true
|
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
post-config:
|
post-config:
|
||||||
$ZUN_CONF:
|
$ZUN_CONF:
|
||||||
|
Reference in New Issue
Block a user