From 242d617502eba2b8328a7be6440275cbe3182de9 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Thu, 14 May 2020 18:56:09 +0800
Subject: [PATCH] Add native grenade zuul v3 jobs

Depends-On: https://review.opendev.org/#/c/731681/
Change-Id: I64d205b406ac220e481fd8d3c1d611a7b24f32f6
---
 .zuul.yaml                                    | 43 ++++++++----
 .../legacy/grenade-devstack-murano/post.yaml  | 15 ----
 .../legacy/grenade-devstack-murano/run.yaml   | 70 -------------------
 3 files changed, 30 insertions(+), 98 deletions(-)
 delete mode 100644 playbooks/legacy/grenade-devstack-murano/post.yaml
 delete mode 100644 playbooks/legacy/grenade-devstack-murano/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index b281bdd28..21dd4030d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -119,19 +119,36 @@
 
 - job:
     name: murano-grenade
-    parent: legacy-dsvm-base
-    timeout: 10800
+    parent: grenade
     voting: false
-    run: playbooks/legacy/grenade-devstack-murano/run.yaml
-    post-run: playbooks/legacy/grenade-devstack-murano/post.yaml
     irrelevant-files: *murano-irrelevant-files
     required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/heat
-      - openstack/murano
-      - openstack/murano-dashboard
-      - openstack/python-heatclient
-      - openstack/python-muranoclient
-      - openstack/heat-tempest-plugin
-      - openstack/murano-tempest-plugin
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/heat
+      - opendev.org/openstack/murano
+      - opendev.org/openstack/murano-dashboard
+      - opendev.org/openstack/python-heatclient
+      - opendev.org/openstack/python-muranoclient
+      - opendev.org/openstack/murano-tempest-plugin
+      - opendev.org/openstack/heat-tempest-plugin
+    vars:
+      grenade_localrc:
+        RUN_HEAT_INTEGRATION_TESTS: False
+      devstack_plugins:
+        murano: https://opendev.org/openstack/murano
+        heat: https://opendev.org/openstack/heat
+      devstack_services:
+        tempest: true
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        tls-proxy: false
+        h-api: true
+        h-api-cfn: true
+        h-eng: true
+        heat: true
+      tempest_plugins:
+        - murano-tempest-plugin
+      tempest_test_regex: ^murano_tempest_tests\.tests\.scenario\.application_catalog\.test_deployment
+      tox_envlist: all
diff --git a/playbooks/legacy/grenade-devstack-murano/post.yaml b/playbooks/legacy/grenade-devstack-murano/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/grenade-devstack-murano/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/grenade-devstack-murano/run.yaml b/playbooks/legacy/grenade-devstack-murano/run.yaml
deleted file mode 100644
index 9c0a0370f..000000000
--- a/playbooks/legacy/grenade-devstack-murano/run.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- hosts: all
-  name: legacy-grenade-dsvm-watcher
-  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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin'
-          enable_plugin heat https://opendev.org/openstack/heat
-          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_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export PROJECTS="openstack/heat $PROJECTS"
-          export PROJECTS="openstack/python-heatclient $PROJECTS"
-          export PROJECTS="openstack/murano $PROJECTS"
-          export PROJECTS="openstack/murano-dashboard $PROJECTS"
-          export PROJECTS="openstack/python-muranoclient $PROJECTS"
-          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
-          export BRANCH_OVERRIDE=default
-
-          export GRENADE_PLUGINRC="enable_grenade_plugin murano https://opendev.org/openstack/murano"
-          export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://opendev.org/openstack/heat"
-          export DEVSTACK_GATE_GRENADE=pullup
-
-
-          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 }}'