Merge "Add a test for custom compute flavors for amphorae"
diff --git a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
index 2e1464c..3c92181 100644
--- a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
+++ b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
@@ -1256,7 +1256,18 @@
const.ACTIVE,
CONF.load_balancer.build_interval,
CONF.load_balancer.build_timeout)
-
+ # TODO(johnsom) - Remove this once eventlet is removed from OpenStack
+ # NOTE(pas-ha): depending on what other tempest plugins are installed
+ # the eventlet might've been imported by that time, and, since
+ # dnspython 2.2.0, importing eventlet or any part of it effectively
+ # instantiates a dummy httpx.Client instance, thus pinning the ssl
+ # implementation in httpx to the eventlet's one.
+ # This leads to error in the Client() call below, as the ssl lib in
+ # this module is different from ssl lib in httpx._config,
+ # which fails isinstance check for ssl.SSLContext.
+ # Use the ssl module that is actually used by httpx to instantiate
+ # the SSL context to be used with httpx.
+ ssl = httpx._config.ssl
context = ssl.create_default_context(cadata=self.ca_cert.public_bytes(
serialization.Encoding.PEM).decode('utf-8'))
context.check_hostname = False
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d43876b..cb40790 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -29,16 +29,6 @@
- controller
- nodeset:
- name: octavia-single-node-centos-7
- nodes:
- - name: controller
- label: nested-virt-centos-7
- groups:
- - name: tempest
- nodes:
- - controller
-
-- nodeset:
name: octavia-single-node-centos-8
nodes:
- name: controller
@@ -762,16 +752,6 @@
loadbalancer_topology: ACTIVE_STANDBY
- job:
- name: octavia-v2-dsvm-py2-scenario-centos-7
- parent: octavia-v2-dsvm-py2-scenario
- nodeset: octavia-single-node-centos-7
- vars:
- devstack_localrc:
- OCTAVIA_AMP_BASE_OS: centos
- OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
- OCTAVIA_AMP_IMAGE_SIZE: 3
-
-- job:
name: octavia-v2-dsvm-scenario-centos-8
parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-centos-8
@@ -997,11 +977,6 @@
parent: octavia-v2-dsvm-scenario
- job:
- name: octavia-v2-dsvm-scenario-centos-7
- parent: octavia-v2-dsvm-py2-scenario-centos-7
- nodeset: octavia-single-node-centos-7
-
-- job:
name: octavia-v2-act-stdby-iptables-dsvm-scenario
parent: octavia-dsvm-live-base
pre-run: playbooks/act_stby_iptables/pre.yaml
@@ -1039,22 +1014,6 @@
override-checkout: 2.30.0
- job:
- name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7
- parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
- nodeset: octavia-single-node-centos-7
- vars:
- devstack_localrc:
- USE_PYTHON3: False
- OCTAVIA_AMP_BASE_OS: centos
- OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
- OCTAVIA_AMP_IMAGE_SIZE: 3
- devstack_local_conf:
- test-config:
- "$TEMPEST_CONFIG":
- load_balancer:
- amphora_ssh_user: centos
-
-- job:
name: octavia-v2-act-stdby-dsvm-scenario-base
parent: octavia-dsvm-live-base
vars: