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
This commit is contained in:
Ade Lee 2023-03-26 15:52:30 +02:00
parent 3c7eebaaf3
commit e64f4c2b07
2 changed files with 2 additions and 6 deletions

View File

@ -1,4 +0,0 @@
- hosts: all
tasks:
- include_role:
name: enable-fips

View File

@ -342,11 +342,11 @@
description: | description: |
Integration testing for a FIPS enabled Centos 8 system Integration testing for a FIPS enabled Centos 8 system
nodeset: devstack-single-node-centos-8-stream nodeset: devstack-single-node-centos-8-stream
pre-run: playbooks/enable-fips.yaml
vars: vars:
tox_envlist: full tox_envlist: full
configure_swap_size: 4096 configure_swap_size: 4096
nslookup_target: 'opendev.org' nslookup_target: 'opendev.org'
enable_fips: True
- job: - job:
name: tempest-centos9-stream-fips name: tempest-centos9-stream-fips
@ -355,11 +355,11 @@
Integration testing for a FIPS enabled Centos 9 system Integration testing for a FIPS enabled Centos 9 system
timeout: 10800 timeout: 10800
nodeset: devstack-single-node-centos-9-stream nodeset: devstack-single-node-centos-9-stream
pre-run: playbooks/enable-fips.yaml
vars: vars:
tox_envlist: full tox_envlist: full
configure_swap_size: 4096 configure_swap_size: 4096
nslookup_target: 'opendev.org' nslookup_target: 'opendev.org'
enable_fips: True
- job: - job:
name: tempest-pg-full name: tempest-pg-full