From 1d3e516dea5448f2230354d1457f488b34a2bd4d Mon Sep 17 00:00:00 2001
From: Samuel Matzek <smatzek@us.ibm.com>
Date: Thu, 26 Oct 2017 07:44:00 -0500
Subject: [PATCH] Fix gate / add tempest job

The Zuul v3 conversion missed the
tempest-dsvm-neutron-src-python-troveclient job and the base
tempest job is running in its place and blocking the gate.

This adds the Zuul project config and the definition for the
missing tempest job.

Change-Id: I532776e2e23b1ab5a5c9ef2b0278489f04a1097f
---
 .zuul.yaml                                    | 27 +++++++++
 .../post.yaml                                 | 15 +++++
 .../run.yaml                                  | 60 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 .zuul.yaml
 create mode 100644 playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml
 create mode 100644 playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 00000000..39baa460
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,27 @@
+- project:
+    name: openstack/python-troveclient
+    templates:
+      - osc-plugin-jobs
+    check:
+      jobs:
+        - tempest-neutron-src-python-troveclient
+    gate:
+      queue: trove
+      jobs:
+        - tempest-neutron-src-python-troveclient
+
+- job:
+    name: tempest-neutron-src-python-troveclient
+    parent: legacy-dsvm-base
+    run: playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run
+    post-run: playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post
+    timeout: 7800
+    required-projects:
+      - openstack-dev/devstack
+      - openstack-infra/devstack-gate
+      - openstack/ara
+      - openstack/neutron
+      - openstack/python-troveclient
+      - openstack/trove
+      - openstack/trove-dashboard
+      - openstack/tempest
diff --git a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml
new file mode 100644
index 00000000..e07f5510
--- /dev/null
+++ b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/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/tempest-dsvm-neutron-src-python-troveclient/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
new file mode 100644
index 00000000..a4238c8a
--- /dev/null
+++ b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
@@ -0,0 +1,60 @@
+- hosts: all
+  name: tempest-python-trovelient-neutron-src, copied from
+    old job gate-tempest-dsvm-neutron-src-python-troveclient-ubuntu-xenial
+  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-infra/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org \
+              openstack-infra/devstack-gate
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat << 'EOF' >>"/tmp/dg-local.conf"
+          [[local|localrc]]
+          enable_plugin trove git://git.openstack.org/openstack/trove
+
+          EOF
+        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_TROVE=1
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE=default
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export PROJECTS="openstack/trove-dashboard $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
+          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 }}'