zuul: switch to the new tempest native jobs
- re-enable the tempest jobs and use the version defined inside barbican-tempest-plugin; - (temporarily) define compatibility alias based on the new jobs so that the users of the legacy ones are not broken. Depends-On: https://review.opendev.org/745321 Change-Id: Ibcfe314eb7e8a132d68d5b139956246c54c509ad
This commit is contained in:
Luigi Toscano
parent
36b2f65833
commit
79f0f10118
44
.zuul.yaml
44
.zuul.yaml
@ -42,45 +42,29 @@
|
|||||||
devstack_services:
|
devstack_services:
|
||||||
kmip: true
|
kmip: true
|
||||||
|
|
||||||
- job:
|
|
||||||
name: barbican-devstack-tempest-base
|
|
||||||
parent: legacy-dsvm-base
|
|
||||||
vars:
|
|
||||||
database: sql
|
|
||||||
castellan_from_git: 0
|
|
||||||
cursive: 0
|
|
||||||
required-projects:
|
|
||||||
- openstack/devstack-gate
|
|
||||||
- openstack/barbican
|
|
||||||
- openstack/barbican-tempest-plugin
|
|
||||||
- openstack/castellan
|
|
||||||
- x/cursive
|
|
||||||
- openstack/python-barbicanclient
|
|
||||||
- openstack/tempest
|
|
||||||
run: playbooks/legacy/barbican-devstack-tempest-base/run.yaml
|
|
||||||
post-run: playbooks/legacy/barbican-devstack-tempest-base/post.yaml
|
|
||||||
timeout: 4200
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: barbican-simple-crypto-devstack-tempest
|
name: barbican-simple-crypto-devstack-tempest
|
||||||
parent: barbican-devstack-tempest-base
|
parent: barbican-tempest-plugin-simple-crypto
|
||||||
|
description: |
|
||||||
|
Compatibility alias for barbican-tempest-plugin-simple-crypto
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: barbican-simple-crypto-devstack-tempest-ipv6-only
|
name: barbican-simple-crypto-devstack-tempest-ipv6-only
|
||||||
parent: barbican-simple-crypto-devstack-tempest
|
parent: barbican-tempest-plugin-simple-crypto-ipv6-only
|
||||||
run: playbooks/legacy/barbican-devstack-tempest-base/run-ipv6.yaml
|
description: |
|
||||||
|
Compatibility alias for barbican-tempest-plugin-simple-crypto-ipv6-only
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: barbican-simple-crypto-devstack-tempest-castellan-from-git
|
name: barbican-simple-crypto-devstack-tempest-castellan-from-git
|
||||||
parent: barbican-devstack-tempest-base
|
parent: barbican-tempest-plugin-simple-crypto-castellan-src
|
||||||
vars:
|
description: |
|
||||||
castellan_from_git: 1
|
Compatibility alias for barbican-tempest-plugin-simple-crypto-castellan-src
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: barbican-simple-crypto-devstack-tempest-cursive
|
name: barbican-simple-crypto-devstack-tempest-cursive
|
||||||
parent: barbican-devstack-tempest-base
|
parent: barbican-tempest-plugin-simple-crypto-cursive
|
||||||
vars:
|
description: |
|
||||||
cursive: 1
|
Compatibility alias for barbican-tempest-plugin-simple-crypto-cursive
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: barbican-grenade
|
name: barbican-grenade
|
||||||
@ -107,8 +91,8 @@
|
|||||||
voting: false
|
voting: false
|
||||||
- barbican-grenade:
|
- barbican-grenade:
|
||||||
voting: false
|
voting: false
|
||||||
# - barbican-simple-crypto-devstack-tempest
|
- barbican-tempest-plugin-simple-crypto
|
||||||
# - barbican-simple-crypto-devstack-tempest-ipv6-only
|
- barbican-tempest-plugin-simple-crypto-ipv6-only
|
||||||
- octavia-v2-dsvm-tls-barbican
|
- octavia-v2-dsvm-tls-barbican
|
||||||
# TripleO jobs that deploy Barbican.
|
# TripleO jobs that deploy Barbican.
|
||||||
# Note we don't use a project-template here, so it's easier
|
# Note we don't use a project-template here, so it's easier
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
- hosts: primary
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
|
||||||
synchronize:
|
|
||||||
src: '{{ ansible_user_dir }}/workspace/'
|
|
||||||
dest: '{{ zuul.executor.log_root }}'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=/logs/**
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
- hosts: all
|
|
||||||
name: Barbican devstack tempest IPv6 job
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Ensure legacy workspace directory
|
|
||||||
file:
|
|
||||||
path: '{{ ansible_user_dir }}/workspace'
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
cat > clonemap.yaml << EOF
|
|
||||||
clonemap:
|
|
||||||
- name: openstack/devstack-gate
|
|
||||||
dest: devstack-gate
|
|
||||||
EOF
|
|
||||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
|
||||||
https://opendev.org \
|
|
||||||
openstack/devstack-gate
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
export DEVSTACK_GATE_TEMPEST_REGEX=barbican
|
|
||||||
export KEEP_LOCALRC=1
|
|
||||||
|
|
||||||
export PROJECTS="openstack/barbican $PROJECTS"
|
|
||||||
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
|
|
||||||
export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://opendev.org/openstack/barbican"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
|
|
||||||
|
|
||||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_IP_VERSION=6"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_HOST=''"
|
|
||||||
|
|
||||||
export BRANCH_OVERRIDE=default
|
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
||||||
fi
|
|
||||||
# Add configuration values for enabling security features in local.conf
|
|
||||||
function pre_test_hook {
|
|
||||||
if [ -f $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh ] ; then
|
|
||||||
. $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
export -f pre_test_hook
|
|
||||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
|
||||||
if [ "{{ database }}" == "postgres" ] ; then
|
|
||||||
export DEVSTACK_GATE_POSTGRES=1
|
|
||||||
elif [ "{{ castellan_from_git }}" == "1" ] ; then
|
|
||||||
export DEVSTACK_PROJECT_FROM_GIT="castellan"
|
|
||||||
elif [ "{{ cursive }}" == "1" ] ; then
|
|
||||||
export DEVSTACK_PROJECT_FROM_GIT="cursive"
|
|
||||||
fi
|
|
||||||
|
|
||||||
function post_test_hook {
|
|
||||||
cd $BASE/new/tempest/tools
|
|
||||||
./verify-ipv6-only-deployments.sh
|
|
||||||
}
|
|
||||||
export -f post_test_hook
|
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
||||||
|
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
- hosts: all
|
|
||||||
name: Barbican devstack tempest base
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Ensure legacy workspace directory
|
|
||||||
file:
|
|
||||||
path: '{{ ansible_user_dir }}/workspace'
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
cat > clonemap.yaml << EOF
|
|
||||||
clonemap:
|
|
||||||
- name: openstack/devstack-gate
|
|
||||||
dest: devstack-gate
|
|
||||||
EOF
|
|
||||||
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
|
|
||||||
https://opendev.org \
|
|
||||||
openstack/devstack-gate
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
export DEVSTACK_GATE_TEMPEST_REGEX=barbican
|
|
||||||
export KEEP_LOCALRC=1
|
|
||||||
|
|
||||||
export PROJECTS="openstack/barbican $PROJECTS"
|
|
||||||
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
|
|
||||||
export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://opendev.org/openstack/barbican"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
|
|
||||||
|
|
||||||
export BRANCH_OVERRIDE=default
|
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
||||||
fi
|
|
||||||
# Add configuration values for enabling security features in local.conf
|
|
||||||
function pre_test_hook {
|
|
||||||
if [ -f $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh ] ; then
|
|
||||||
. $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
export -f pre_test_hook
|
|
||||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
|
||||||
|
|
||||||
if [ "{{ database }}" == "postgres" ] ; then
|
|
||||||
export DEVSTACK_GATE_POSTGRES=1
|
|
||||||
elif [ "{{ castellan_from_git }}" == "1" ] ; then
|
|
||||||
export DEVSTACK_PROJECT_FROM_GIT="castellan"
|
|
||||||
elif [ "{{ cursive }}" == "1" ] ; then
|
|
||||||
export DEVSTACK_PROJECT_FROM_GIT="cursive"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
||||||
|
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
Loading…
Reference in New Issue
Block a user