Merge "remove unicode from code"
diff --git a/.zuul.yaml b/.zuul.yaml
index 2195fa1..a73a48f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -147,15 +147,29 @@
name: telemetry-dsvm-integration-centos-8s
nodeset: devstack-single-node-centos-8-stream
parent: telemetry-dsvm-integration
+ branches:
+ - stable/wallaby
+ - stable/xena
+ - stable/yoga
description: |
- Telemetry devstack tempest tests job for a Centos 8 stream system
+ Telemetry devstack tempest test job for Centos 8 stream system using python 36
+ i.e. yoga and below
+ vars:
+ devstack_localrc:
+ # for versions of devstack that don't explicitly support rhel8
+ FORCE: 'yes'
+ TEMPEST_BRANCH: '30.1.0'
+ TEMPEST_VENV_UPPER_CONSTRAINTS: '/opt/stack/requirements/upper-constraints.txt'
- job:
name: telemetry-dsvm-integration-centos-8s-fips
parent: telemetry-dsvm-integration-centos-8s
description: |
- Telemetry devstack tempest tests job for a FIPS enabled Centos 8 stream system
+ Telemetry devstack tempest tests job for a FIPS enabled Centos 8 stream system using python36
+ i.e. yoga and below
pre-run: playbooks/enable-fips.yaml
+ vars:
+ nslookup_target: 'opendev.org'
- job:
name: telemetry-dsvm-integration-centos-9s
@@ -170,8 +184,11 @@
description: |
Telemetry devstack tempest tests job for a FIPS enabled Centos 9 stream system
pre-run: playbooks/enable-fips.yaml
+ vars:
+ nslookup_target: 'opendev.org'
- project:
+ queue: telemetry
templates:
- check-requirements
- tempest-plugin-jobs
@@ -184,7 +201,6 @@
- telemetry-dsvm-integration-centos-9s
- telemetry-dsvm-integration-centos-9s-fips
gate:
- queue: telemetry
jobs:
- telemetry-dsvm-integration
- telemetry-dsvm-integration-ipv6-only