Port the grenade multinode job to Zuul v3

It implements the same behavior of the old one.

It is worth noting that the existing job the MULTI_KEYSTONE does not
produce any effect because this change hasn't been merged yet:
- https://review.opendev.org/399472
and when that merges, the following devstack-gate changes should be
applied directly to this new job definition instead:
- https://review.opendev.org/394895

Both changes are out of scope for this porting.

Change-Id: I5d5d31c8d89b0d2812a5e9be18a81611041e6da8
(cherry picked from commit 3be8d40fc5)
This commit is contained in:
Luigi Toscano 2020-06-05 14:25:26 +02:00
parent 624c2101ce
commit 1c37797c51
3 changed files with 9 additions and 70 deletions

View File

@ -110,15 +110,17 @@
# Experimental # Experimental
- job: - job:
name: keystone-dsvm-grenade-multinode name: keystone-grenade-multinode
parent: legacy-dsvm-base-multinode parent: grenade-multinode
run: playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
post-run: playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml
timeout: 10800
required-projects: required-projects:
- openstack/grenade - openstack/grenade
- openstack/devstack-gate
- openstack/keystone - openstack/keystone
vars:
devstack_plugins:
keystone: https://opendev.org/openstack/keystone
grenade_devstack_localrc:
shared:
MULTI_KEYSTONE: True
# Experimental # Experimental
- job: - job:
@ -237,7 +239,7 @@
experimental: experimental:
jobs: jobs:
- keystone-tox-patch_cover - keystone-tox-patch_cover
- keystone-dsvm-grenade-multinode: - keystone-grenade-multinode:
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files
- openstack-ansible-keystone-rolling-upgrade: - openstack-ansible-keystone-rolling-upgrade:
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files

View File

@ -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

View File

@ -1,48 +0,0 @@
- hosts: primary
name: Autoconverted job legacy-keystone-dsvm-grenade-multinode from old job gate-keystone-dsvm-grenade-multinode-ubuntu-xenial-nv
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_CONFIGDRIVE=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_USE_PYTHON3=True
export PROJECTS="openstack/grenade $PROJECTS"
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_GATE_TOPOLOGY="multinode"
export MULTI_KEYSTONE=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin keystone https://opendev.org/openstack/keystone"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MULTI_KEYSTONE=1"
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 }}'