Merge "Add SCTP protocol listener api tests"
diff --git a/README.rst b/README.rst
index 8b5bd3c..beb0f5a 100644
--- a/README.rst
+++ b/README.rst
@@ -30,20 +30,26 @@
Installing
----------
-Clone this repository to the destination machine, and call from the repo::
+From the tempest directory, setup the tempest virtual environment for the
+Octavia tempest plugin::
- $ pip install -e .
+ $ tox -e venv-tempest -- pip3 install -e <path to octavia-tempest-plugin>
+
+For example, when using a typical devstack setup::
+
+ $ cd /opt/stack/tempest
+ $ tox -e venv-tempest -- pip3 install -e /opt/stack/octavia-tempest-plugin
Running the tests
-----------------
To run all the tests from this plugin, call from the tempest repo::
- $ tox -e all-plugin -- octavia_tempest_plugin
+ $ tox -e all -- octavia_tempest_plugin
To run a single test case, call with full path, for example::
- $ tox -e all-plugin -- octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest.test_basic_traffic
+ $ tox -e all -- octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest.test_basic_traffic
To retrieve a list of all tempest tests, run::
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4718e9f..0b5b401 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -560,18 +560,6 @@
override-checkout: stable/yoga
- job:
- name: octavia-v2-dsvm-noop-api-stable-xena
- parent: octavia-v2-dsvm-noop-api
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/xena
-
-- job:
- name: octavia-v2-dsvm-noop-api-stable-wallaby
- parent: octavia-v2-dsvm-noop-api
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/wallaby
-
-- job:
name: octavia-v2-dsvm-scenario-base
parent: octavia-dsvm-live-base
vars:
@@ -598,7 +586,9 @@
- job:
name: octavia-v2-dsvm-scenario
parent: octavia-v2-dsvm-scenario-base
- branches: ^(?!stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
@@ -709,43 +699,6 @@
vars:
tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
-
-- job:
- name: octavia-v2-dsvm-scenario-stable-xena
- parent: octavia-v2-dsvm-scenario
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/xena
-
-- job:
- name: octavia-v2-dsvm-scenario-traffic-ops-stable-xena
- parent: octavia-v2-dsvm-scenario-stable-xena
- vars:
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
-
-- job:
- name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena
- parent: octavia-v2-dsvm-scenario-stable-xena
- vars:
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
-
-- job:
- name: octavia-v2-dsvm-scenario-stable-wallaby
- parent: octavia-v2-dsvm-scenario
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/wallaby
-
-- job:
- name: octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby
- parent: octavia-v2-dsvm-scenario-stable-wallaby
- vars:
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
-
-- job:
- name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby
- parent: octavia-v2-dsvm-scenario-stable-wallaby
- vars:
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
-
# Legacy jobs for the transition to the act-stdby two node jobs
- job:
name: octavia-v2-dsvm-scenario-two-node
@@ -903,7 +856,9 @@
- job:
name: octavia-v2-dsvm-tls-barbican
parent: octavia-v2-dsvm-tls-barbican-base
- branches: ^(?!stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
@@ -928,7 +883,7 @@
name: octavia-v2-dsvm-tls-barbican-stable-2023-1
parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2023-1
+ override-checkout: stable/2023.1
- job:
name: octavia-v2-dsvm-tls-barbican-stable-zed
@@ -942,30 +897,7 @@
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-xena
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/xena
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-wallaby
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/wallaby
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-victoria
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/victoria
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-ussuri
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
+# Still used by barbican
- job:
name: octavia-v2-dsvm-tls-barbican-stable-train
parent: octavia-v2-dsvm-tls-barbican
@@ -1135,7 +1067,9 @@
- job:
name: octavia-v2-act-stdby-dsvm-scenario
parent: octavia-v2-act-stdby-dsvm-scenario-base
- branches: ^(?!stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
@@ -1154,7 +1088,7 @@
name: octavia-v2-act-stdby-dsvm-scenario-stable-2023-1
parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2023-1
+ override-checkout: stable/2023.1
- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-zed
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 710ae35..ebccc0f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -12,8 +12,6 @@
- octavia-v2-dsvm-noop-api-stable-2023-1
- octavia-v2-dsvm-noop-api-stable-zed
- octavia-v2-dsvm-noop-api-stable-yoga
- - octavia-v2-dsvm-noop-api-stable-xena
- - octavia-v2-dsvm-noop-api-stable-wallaby
- octavia-v2-dsvm-noop-api-keystone-default-roles
- octavia-v2-dsvm-scenario-traffic-ops
- octavia-v2-dsvm-scenario-non-traffic-ops
@@ -23,20 +21,12 @@
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed
- octavia-v2-dsvm-scenario-traffic-ops-stable-yoga
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga
- - octavia-v2-dsvm-scenario-traffic-ops-stable-xena
- - octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena
- - octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby
- - octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby
- octavia-v2-dsvm-tls-barbican
- octavia-v2-dsvm-tls-barbican-stable-2023-1
- octavia-v2-dsvm-tls-barbican-stable-zed
- octavia-v2-dsvm-tls-barbican-stable-yoga
- - octavia-v2-dsvm-tls-barbican-stable-xena
- - octavia-v2-dsvm-tls-barbican-stable-wallaby
- octavia-v2-dsvm-scenario-ipv6-only:
voting: false
- - octavia-v2-dsvm-scenario-centos-8-stream:
- voting: false
- octavia-v2-dsvm-scenario-centos-9-stream-traffic-ops:
voting: false
- octavia-v2-dsvm-scenario-centos-9-stream-non-traffic-ops:
@@ -51,12 +41,6 @@
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-yoga:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-xena:
- voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-wallaby:
- voting: false
- - octavia-v2-dsvm-spare-pool-stable-wallaby:
- voting: false
- octavia-v2-dsvm-cinder-amphora:
voting: false
# Third party provider jobs
@@ -72,8 +56,6 @@
- octavia-v2-dsvm-noop-api-stable-2023-1
- octavia-v2-dsvm-noop-api-stable-zed
- octavia-v2-dsvm-noop-api-stable-yoga
- - octavia-v2-dsvm-noop-api-stable-xena
- - octavia-v2-dsvm-noop-api-stable-wallaby
- octavia-v2-dsvm-noop-api-keystone-default-roles
- octavia-v2-dsvm-scenario-traffic-ops
- octavia-v2-dsvm-scenario-non-traffic-ops
@@ -83,13 +65,7 @@
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed
- octavia-v2-dsvm-scenario-traffic-ops-stable-yoga
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga
- - octavia-v2-dsvm-scenario-traffic-ops-stable-xena
- - octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena
- - octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby
- - octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby
- octavia-v2-dsvm-tls-barbican
- octavia-v2-dsvm-tls-barbican-stable-2023-1
- octavia-v2-dsvm-tls-barbican-stable-zed
- octavia-v2-dsvm-tls-barbican-stable-yoga
- - octavia-v2-dsvm-tls-barbican-stable-xena
- - octavia-v2-dsvm-tls-barbican-stable-wallaby