Merge "Move grenade neutron-lib job to py3 and in python-neutronclient repo"

3 files changed, 94 insertions, 1 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index bc6861a..7d3ff43 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,7 +18,7 @@
         - neutronclient-functional
     experimental:
       jobs:
-        - legacy-grenade-dsvm-neutron-libs:
+        - neutron-lib-grenade-dsvm:
             irrelevant-files:
               - ^(test-|)requirements.txt$
               - ^setup.cfg$
@@ -45,3 +45,29 @@
         LIBS_FROM_GIT: python-neutronclient
       devstack_plugins:
         neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas
+
+- job:
+    name: neutron-lib-grenade-dsvm
+    # Old name: legacy-grenade-dsvm-neutron-libs
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/grenade-dsvm-neutron-libs/run.yaml
+    post-run: playbooks/legacy/grenade-dsvm-neutron-libs/post.yaml
+    timeout: 10800
+    required-projects:
+      - openstack/grenade
+      - openstack/devstack-gate
+      - openstack/keystoneauth
+      - openstack/neutron
+      - openstack/neutron-lib
+      - openstack/os-client-config
+      - openstack/python-cinderclient
+      - openstack/python-glanceclient
+      - openstack/python-ironicclient
+      - openstack/python-keystoneclient
+      - openstack/python-neutronclient
+      - openstack/python-novaclient
+    # This is py3 version for ussuri onwards rest all branch needs to be py2
+    # version which is present in openstack-zuul-jobs.
+    # We need to take care of this branch variant and python version while
+    # migrating these jobs to zuulv3.
+    branches: ^(?!(stable/(ocata|pike|queens|rocky|stein|train))).*$
diff --git a/playbooks/legacy/grenade-dsvm-neutron-libs/post.yaml b/playbooks/legacy/grenade-dsvm-neutron-libs/post.yaml
new file mode 100644
index 0000000..e07f551
--- /dev/null
+++ b/playbooks/legacy/grenade-dsvm-neutron-libs/post.yaml
@@ -0,0 +1,15 @@
+- 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/grenade-dsvm-neutron-libs/run.yaml b/playbooks/legacy/grenade-dsvm-neutron-libs/run.yaml
new file mode 100644
index 0000000..6c60061
--- /dev/null
+++ b/playbooks/legacy/grenade-dsvm-neutron-libs/run.yaml
@@ -0,0 +1,52 @@
+- hosts: all
+  name: Autoconverted job legacy-grenade-dsvm-neutron-libs from old job gate-grenade-dsvm-neutron-libs-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 DEVSTACK_PROJECT_FROM_GIT="os-client-config"
+          export DEVSTACK_PROJECT_FROM_GIT+=",keystoneauth"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-novaclient"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-keystoneclient"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-glanceclient"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-cinderclient"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-neutronclient"
+          export DEVSTACK_PROJECT_FROM_GIT+=",python-ironicclient"
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_GRENADE=pullup
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE=default
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          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 }}'