Merge "Enable HTTPS on the test servers"
diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_traffic_ops.py b/octavia_tempest_plugin/tests/scenario/v2/test_traffic_ops.py
index 92e5ecb..356327b 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_traffic_ops.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_traffic_ops.py
@@ -928,9 +928,11 @@
listener_id, pool_id = self._listener_pool_create(
const.TCP, 60092,
pool_algorithm=const.LB_ALGORITHM_SOURCE_IP_PORT)
+ # Without a delay this can trigger a "Cannot assign requested
+ # address" warning setting the source port, leading to failure
self._test_basic_traffic(
const.TCP, 60092, listener_id, pool_id, traffic_member_count=1,
- persistent=False, source_port=60092)
+ persistent=False, source_port=60092, delay=0.2)
except exceptions.NotImplemented as e:
message = ("The configured provider driver '{driver}' "
"does not support a feature required for this "
diff --git a/octavia_tempest_plugin/tests/validators.py b/octavia_tempest_plugin/tests/validators.py
index a93e2eb..5972d54 100644
--- a/octavia_tempest_plugin/tests/validators.py
+++ b/octavia_tempest_plugin/tests/validators.py
@@ -284,6 +284,9 @@
HTTPS_verify, requests_session=requests_session,
source_port=source_port)
+ if source_port:
+ LOG.debug('Using source port %s for request(s)', source_port)
+
response_counts = {}
# Send a number requests to lb vip
for i in range(repeat):
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0918602..2753923 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -475,11 +475,6 @@
override-checkout: stable/train
- job:
- name: octavia-v2-dsvm-noop-api-stable-stein
- parent: octavia-v2-dsvm-noop-api
- override-checkout: stable/stein
-
-- job:
name: octavia-v2-dsvm-scenario
parent: octavia-dsvm-live-base
vars:
@@ -543,20 +538,6 @@
parent: octavia-v2-dsvm-scenario
override-checkout: stable/train
-- job:
- name: octavia-v2-dsvm-scenario-stable-stein
- parent: octavia-v2-dsvm-scenario
- override-checkout: stable/stein
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
- vars:
- devstack_local_conf:
- test-config:
- "$TEMPEST_CONFIG":
- loadbalancer-feature-enabled:
- log_offload_enabled: False
-
# Legacy jobs for the transition to the act-stdby two node jobs
- job:
name: octavia-v2-dsvm-scenario-two-node
@@ -683,14 +664,6 @@
override-checkout: stable/train
- job:
- name: octavia-v2-dsvm-tls-barbican-stable-stein
- parent: octavia-v2-dsvm-tls-barbican
- override-checkout: stable/stein
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
-- job:
name: octavia-v2-dsvm-tls-barbican-stable-rocky
parent: octavia-v2-dsvm-tls-barbican
nodeset: openstack-single-node-xenial
@@ -738,14 +711,6 @@
override-checkout: stable/train
- job:
- name: octavia-v2-dsvm-spare-pool-stable-stein
- parent: octavia-v2-dsvm-spare-pool
- override-checkout: stable/stein
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
-- job:
name: octavia-v2-dsvm-cinder-amphora
parent: octavia-v2-dsvm-scenario
required-projects:
@@ -884,14 +849,6 @@
parent: octavia-v2-act-stdby-dsvm-scenario
override-checkout: stable/train
-- job:
- name: octavia-v2-act-stdby-dsvm-scenario-stable-stein
- parent: octavia-v2-act-stdby-dsvm-scenario
- override-checkout: stable/stein
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
######### Third party jobs ##########
- job:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index d66f616..9f7385d 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -11,15 +11,12 @@
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-api-stable-ussuri
- octavia-v2-dsvm-noop-api-stable-train
- - octavia-v2-dsvm-noop-api-stable-stein
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-scenario-stable-ussuri
- octavia-v2-dsvm-scenario-stable-train
- - octavia-v2-dsvm-scenario-stable-stein
- octavia-v2-dsvm-tls-barbican
- octavia-v2-dsvm-tls-barbican-stable-ussuri
- octavia-v2-dsvm-tls-barbican-stable-train
- - octavia-v2-dsvm-tls-barbican-stable-stein
- octavia-v2-dsvm-scenario-ipv6-only:
voting: false
- octavia-v2-dsvm-scenario-centos-8:
@@ -32,16 +29,12 @@
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-train:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-stein:
- voting: false
- octavia-v2-dsvm-spare-pool:
voting: false
- octavia-v2-dsvm-spare-pool-stable-ussuri:
voting: false
- octavia-v2-dsvm-spare-pool-stable-train:
voting: false
- - octavia-v2-dsvm-spare-pool-stable-stein:
- voting: false
- octavia-v2-dsvm-cinder-amphora:
voting: false
# Third party provider jobs
@@ -56,12 +49,9 @@
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-api-stable-ussuri
- octavia-v2-dsvm-noop-api-stable-train
- - octavia-v2-dsvm-noop-api-stable-stein
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-scenario-stable-ussuri
- octavia-v2-dsvm-scenario-stable-train
- - octavia-v2-dsvm-scenario-stable-stein
- octavia-v2-dsvm-tls-barbican
- octavia-v2-dsvm-tls-barbican-stable-ussuri
- octavia-v2-dsvm-tls-barbican-stable-train
- - octavia-v2-dsvm-tls-barbican-stable-stein