From 6435b3745a603fde53da41716fdcfc1b743583b4 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Mon, 5 Mar 2018 09:56:30 -0500
Subject: [PATCH] Migrate tempest-dsvm-cells job to an in-tree job definition

This defines the nova-cells-v1 job, based the tempest-dsvm-cells
job from openstack-zuul-jobs.

The branch override parts of the job definition are removed since
the job will be defined per-branch now (we'll also have to backport
this to stable/queens).

There will be related changes to project-config, devstack, tempest
and openstack-zuul-jobs on this topic branch to use the new job name.

Part of blueprint remove-nova-network

Change-Id: I25c87f27c69e0cdb74e8553305a09cb85f43d87e
---
 .zuul.yaml                               |  8 +++++
 playbooks/legacy/nova-cells-v1/post.yaml | 15 +++++++++
 playbooks/legacy/nova-cells-v1/run.yaml  | 43 ++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 playbooks/legacy/nova-cells-v1/post.yaml
 create mode 100644 playbooks/legacy/nova-cells-v1/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 2775843507..63d27f7f31 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -70,6 +70,12 @@
     run: playbooks/legacy/nova-caching-scheduler/run.yaml
     post-run: playbooks/legacy/nova-caching-scheduler/post.yaml
 
+- job:
+    name: nova-cells-v1
+    parent: nova-dsvm-base
+    run: playbooks/legacy/nova-cells-v1/run.yaml
+    post-run: playbooks/legacy/nova-cells-v1/post.yaml
+
 - job:
     name: nova-lvm
     parent: nova-dsvm-base
@@ -114,12 +120,14 @@
     # Please try to keep the list of job names sorted alphabetically.
     check:
       jobs:
+        - nova-cells-v1
         - nova-multiattach
         - nova-next
         - nova-tox-functional
         - nova-tox-functional-py35
     gate:
       jobs:
+        - nova-cells-v1
         - nova-multiattach
         - nova-tox-functional
         - nova-tox-functional-py35
diff --git a/playbooks/legacy/nova-cells-v1/post.yaml b/playbooks/legacy/nova-cells-v1/post.yaml
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/nova-cells-v1/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/nova-cells-v1/run.yaml b/playbooks/legacy/nova-cells-v1/run.yaml
new file mode 100644
index 0000000000..88c6eca639
--- /dev/null
+++ b/playbooks/legacy/nova-cells-v1/run.yaml
@@ -0,0 +1,43 @@
+- hosts: all
+  name: nova-cells-v1
+  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
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_CELLS=1
+          # NOTE(mriedem): Explicitly tell devstack-gate that we need to run
+          # the cells v1 job with nova-network.
+          export DEVSTACK_GATE_NEUTRON=0
+
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-cells-rc
+
+          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 }}'