Simplify definition of fips jobs
With the new base jobs, it is no longer necessary to define a pre-run
playbook. You simply need to set enable_fips to True and specify an
nslookup_target. This will set things up to use ubuntu jobs when FIPS
is supported on jammy
Depends-On: https://review.opendev.org/c/openstack/devstack/+/871606
Change-Id: I1c02c4817a39d26e94873831801089d1aa86133c
diff --git a/playbooks/enable-fips.yaml b/playbooks/enable-fips.yaml
deleted file mode 100644
index c8f042d..0000000
--- a/playbooks/enable-fips.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
- tasks:
- - include_role:
- name: enable-fips
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index 6c495b7..233cb6c 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -342,11 +342,11 @@
description: |
Integration testing for a FIPS enabled Centos 8 system
nodeset: devstack-single-node-centos-8-stream
- pre-run: playbooks/enable-fips.yaml
vars:
tox_envlist: full
configure_swap_size: 4096
nslookup_target: 'opendev.org'
+ enable_fips: True
- job:
name: tempest-centos9-stream-fips
@@ -355,11 +355,11 @@
Integration testing for a FIPS enabled Centos 9 system
timeout: 10800
nodeset: devstack-single-node-centos-9-stream
- pre-run: playbooks/enable-fips.yaml
vars:
tox_envlist: full
configure_swap_size: 4096
nslookup_target: 'opendev.org'
+ enable_fips: True
- job:
name: tempest-pg-full