From 9d67d0ff95d572d2a27cd50774b81b3eec4882df Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 6 Aug 2020 18:29:55 +0200
Subject: [PATCH] zuul: port the legacy multinode grenade job

Make it a native Zuul v3 job.
It is a simple variant of the base 'grenade-multinode' job
where oslo.versionedobjects is installed from source instead of pip.

Also use a slightly more common name by dropping the "-devstack"
component from the name (all grenade jobs are also devstack jobs).

Finally, remove the hardcoded xenial nodeset, thus inheriting the
default testing definition for it, and probably unbreaking
the job which has been failing so far.

Change-Id: Ia209311d57f607b2ddfcab8518264cd7f670dc8f
---
 .zuul.yaml                                    | 14 ++---
 .../post.yaml                                 | 15 ------
 .../run.yaml                                  | 53 -------------------
 3 files changed, 4 insertions(+), 78 deletions(-)
 delete mode 100644 playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/post.yaml
 delete mode 100644 playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 7b7039a..600de85 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
     check:
       jobs:
-        - oslo.versionedobjects-src-grenade-devstack-multinode
+        - oslo.versionedobjects-src-grenade-multinode
     templates:
       - check-requirements
       - lib-forward-testing-python3
@@ -12,17 +12,11 @@
       - release-notes-jobs-python3
 
 - job:
-    name: oslo.versionedobjects-src-grenade-devstack-multinode
-    parent: legacy-dsvm-base-multinode
+    name: oslo.versionedobjects-src-grenade-multinode
+    parent: grenade-multinode
     voting: false
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^setup.cfg$
-    run: playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/run.yaml
-    post-run: playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/post.yaml
-    timeout: 10800
     required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/oslo.versionedobjects
-    nodeset: legacy-ubuntu-xenial-2-node
+      - opendev.org/openstack/oslo.versionedobjects
diff --git a/playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/post.yaml b/playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-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/oslo.versionedobjects-src-grenade-devstack-multinode/run.yaml b/playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/run.yaml
deleted file mode 100644
index 5a9d39e..0000000
--- a/playbooks/legacy/oslo.versionedobjects-src-grenade-devstack-multinode/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-oslo.versionedobjects-src-grenade-dsvm-multinode
-    from old job gate-oslo.versionedobjects-src-grenade-dsvm-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 PROJECTS="openstack/grenade $PROJECTS"
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-          export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
-
-          # Even if the branch is overridden, make sure we use
-          # the correct branch using the OVERRIDE_*_PROJECT_BRANCH
-          # variable.
-          uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
-          export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
-
-          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 }}'
-- 
GitLab