Merge "Fix IPv6 tests if ipv6-private-subnet is stateless"
diff --git a/tox.ini b/tox.ini
index f27ed30..1ca36b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,11 +5,12 @@
[testenv]
usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
+install_command = pip install {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
-deps = -r{toxinidir}/test-requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/test-requirements.txt
commands =
stestr run {posargs}
stestr slowest
@@ -40,7 +41,7 @@
[testenv:docs]
basepython = python3
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
whitelist_externals = rm
@@ -51,7 +52,7 @@
[testenv:releasenotes]
basepython = python3
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8e112d6..87c825b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -444,7 +444,7 @@
parent: octavia-v2-dsvm-py2-scenario-centos-7
- job:
- name: octavia-v2-act-stdby-dsvm-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-scenario
parent: octavia-dsvm-live-base
pre-run: playbooks/act_stby_iptables/pre.yaml
vars:
@@ -469,15 +469,15 @@
tox_envlist: all
- job:
- name: octavia-v2-act-stdby-dsvm-py2-scenario
- parent: octavia-v2-act-stdby-dsvm-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
+ parent: octavia-v2-act-stdby-iptables-dsvm-scenario
vars:
devstack_localrc:
USE_PYTHON3: False
- job:
- name: octavia-v2-act-stdby-dsvm-py2-scenario-centos-7
- parent: octavia-v2-act-stdby-dsvm-py2-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7
+ parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
nodeset: devstack-single-node-centos-7
vars:
devstack_localrc:
@@ -492,16 +492,16 @@
amphora_ssh_user: centos
- job:
- name: octavia-v2-act-stdby-dsvm-scenario-stable-stein
- parent: octavia-v2-act-stdby-dsvm-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein
+ parent: octavia-v2-act-stdby-iptables-dsvm-scenario
override-checkout: stable/stein
- job:
- name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky
- parent: octavia-v2-act-stdby-dsvm-py2-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky
+ parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
override-checkout: stable/rocky
- job:
- name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens
- parent: octavia-v2-act-stdby-dsvm-py2-scenario
+ name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens
+ parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
override-checkout: stable/queens
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index af516d7..787dfb0 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -26,17 +26,17 @@
voting: false
- octavia-v2-dsvm-py2-scenario-two-node:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario:
+ - octavia-v2-act-stdby-iptables-dsvm-scenario:
voting: false
- - octavia-v2-act-stdby-dsvm-py2-scenario:
+ - octavia-v2-act-stdby-iptables-dsvm-py2-scenario:
voting: false
- - octavia-v2-act-stdby-dsvm-py2-scenario-centos-7:
+ - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-stein:
+ - octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein:
voting: false
- - octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky:
+ - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky:
voting: false
- - octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens:
+ - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens:
voting: false
- octavia-v2-dsvm-tls-barbican:
voting: false