Merge "Port the grenade multinode job to Zuul v3" into stable/ussuri

3 files changed, 9 insertions, 70 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index a3534a0db..50bd87b37 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -110,15 +110,17 @@
 
 # Experimental
 - job:
-    name: keystone-dsvm-grenade-multinode
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
-    post-run: playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml
-    timeout: 10800
+    name: keystone-grenade-multinode
+    parent: grenade-multinode
     required-projects:
       - openstack/grenade
-      - openstack/devstack-gate
       - openstack/keystone
+    vars:
+      devstack_plugins:
+        keystone: https://opendev.org/openstack/keystone
+      grenade_devstack_localrc:
+        shared:
+          MULTI_KEYSTONE: True
 
 # Experimental
 - job:
@@ -238,7 +240,7 @@
     experimental:
       jobs:
         - keystone-tox-patch_cover
-        - keystone-dsvm-grenade-multinode:
+        - keystone-grenade-multinode:
             irrelevant-files: *irrelevant-files
         - openstack-ansible-keystone-rolling-upgrade:
             irrelevant-files: *irrelevant-files
diff --git a/playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml b/playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml
+++ /dev/null
@@ -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
diff --git a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
deleted file mode 100644
index 115187991..000000000
--- a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
+++ /dev/null
@@ -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 }}'