From 6d7464303ee554de2a598502486574e2a9a4e3f7 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Thu, 3 Mar 2022 13:47:44 -0500 Subject: [PATCH] Change FIPS jobs to centos-9-stream It also fixed the missing nslookup_target variable for ansible. Change-Id: Icbbab19fabc90f4f4ea63a0ffdf75bb00144b745 --- zuul.d/jobs.yaml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index c664fe04a1..d7d98080fe 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -200,38 +200,30 @@ - job: name: octavia-v2-dsvm-scenario-fips parent: octavia-v2-dsvm-scenario - nodeset: octavia-single-node-centos-8-stream + nodeset: octavia-single-node-centos-9-stream description: | - Functional testing for a FIPS enabled Centos 8 system. + Functional testing for a FIPS enabled Centos 9 system. pre-run: playbooks/enable-fips.yaml timeout: 10800 vars: + nslookup_target: 'opendev.org' devstack_localrc: OCTAVIA_AMP_BASE_OS: centos - OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 8-stream + OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 9-stream OCTAVIA_AMP_IMAGE_SIZE: 3 OCTAVIA_AMP_ENABLE_FIPS: True - devstack_local_conf: - test-config: - "$TEMPEST_CONFIG": - validation: - ssh_key_type: 'ecdsa' - job: name: octavia-v2-dsvm-tls-barbican-fips parent: octavia-v2-dsvm-tls-barbican - nodeset: octavia-single-node-centos-8-stream + nodeset: octavia-single-node-centos-9-stream description: | - Functional testing for a FIPS enabled Centos 8 system + Functional testing for a FIPS enabled Centos 9 system pre-run: playbooks/enable-fips.yaml vars: + nslookup_target: 'opendev.org' devstack_localrc: OCTAVIA_AMP_BASE_OS: centos - OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 8-stream + OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 9-stream OCTAVIA_AMP_IMAGE_SIZE: 3 OCTAVIA_AMP_ENABLE_FIPS: True - devstack_local_conf: - test-config: - "$TEMPEST_CONFIG": - validation: - ssh_key_type: 'ecdsa'