Merge "Clean up devstack tempest jobs"

.zuul.yaml

@@ -31,141 +31,139 @@
         - rally-dsvm-senlin-senlin
 
 - job:
-    name: senlin-dsvm-tempest-py27-api
+    name: senlin-tempest-base
-    parent: legacy-dsvm-base
+    parent: devstack-tempest
-    run: playbooks/legacy/senlin-dsvm-tempest-py27-api/run.yaml
+    description: Senlin Devstack tempest base job
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py27-api/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
       - openstack/senlin
       - openstack/senlin-tempest-plugin
-      - openstack/tempest
     irrelevant-files:
       - ^.*\.rst$
       - ^api-ref/.*$
       - ^doc/.*$
-      - ^senlin/tests/unit/.*$
       - ^releasenotes/.*$
+    vars:
+      tox_envlist: all
+      devstack_services:
+        tempest: true
+      devstack_plugins:
+        senlin: https://git.openstack.org/openstack/senlin
+      devstack_localrc:
+        TEMPEST_PLUGINS: '/opt/stack/senlin-tempest-plugin'
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            clustering:
+              min_microversion: 1.12
+              max_microversion: 1.12
+
+- job:
+    name: senlin-dsvm-tempest-py27-api
+    parent: senlin-tempest-base
+    vars:
+      tempest_test_regex: senlin_tempest_plugin.tests.api
+      devstack_local_conf:
+        post-config:
+          $SENLIN_CONF:
+             DEFAULT:
+               cloud_backend: openstack_test
 
 - job:
     name: senlin-dsvm-tempest-py27-functional
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
-    run: playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
+    vars:
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py27-functional/post.yaml
+      tempest_test_regex: senlin_tempest_plugin.tests.functional
-    timeout: 7800
+      devstack_local_conf:
-    required-projects:
+        post-config:
-      - openstack-infra/devstack-gate
+          $SENLIN_CONF:
-      - openstack/heat
+            DEFAULT:
-      - openstack/neutron-lbaas
+              cloud_backend: openstack_test
-      - openstack/python-zaqarclient
+              health_check_interval_min: 10
-      - openstack/senlin
-      - openstack/senlin-tempest-plugin
-      - openstack/tempest
-      - openstack/zaqar
-      - openstack/zaqar-ui
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^senlin/tests/unit/.*$
-      - ^releasenotes/.*$
 
 - job:
     name: senlin-dsvm-tempest-py27-integration
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
-    run: playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
+    vars:
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py27-integration/post.yaml
+      tempest_test_regex: senlin_tempest_plugin.tests.integration
-    timeout: 7800
+      devstack_plugins:
+        zaqar: https://git.openstack.org/openstack/zaqar
+        heat: https://git.openstack.org/openstack/heat
+      devstack_localrc:
+        TEMPEST_PLUGINS: '"/opt/stack/senlin-tempest-plugin /opt/stack/zaqar-tempest-plugin"'
+      devstack_local_conf:
+        post-config:
+          $SENLIN_CONF:
+             DEFAULT:
+               health_check_interval_min: 10
     required-projects:
-      - openstack-infra/devstack-gate
       - openstack/heat
-      - openstack/neutron-lbaas
+      - openstack/octavia
       - openstack/python-zaqarclient
       - openstack/senlin
       - openstack/senlin-tempest-plugin
-      - openstack/tempest
       - openstack/zaqar
       - openstack/zaqar-ui
       - openstack/zaqar-tempest-plugin
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^senlin/tests/unit/.*$
-      - ^releasenotes/.*$
 
 - job:
     name: senlin-dsvm-tempest-py35-api
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
-    run: playbooks/legacy/senlin-dsvm-tempest-py35-api/run.yaml
+    vars:
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py35-api/post.yaml
+      tempest_test_regex: senlin_tempest_plugin.tests.api
-    timeout: 7800
+      devstack_localrc:
-    required-projects:
+        USE_PYTHON3: true
-      - openstack-infra/devstack-gate
+      devstack_local_conf:
-      - openstack/senlin
+        post-config:
-      - openstack/senlin-tempest-plugin
+          $SENLIN_CONF:
-      - openstack/tempest
+             DEFAULT:
-    irrelevant-files:
+               cloud_backend: openstack_test
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^senlin/tests/unit/.*$
-      - ^releasenotes/.*$
 
 - job:
     name: senlin-dsvm-tempest-py35-functional
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
-    run: playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
+    vars:
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py35-functional/post.yaml
+      tempest_test_regex: senlin_tempest_plugin.tests.functional
-    timeout: 7800
+      devstack_localrc:
-    required-projects:
+        USE_PYTHON3: true
-      - openstack-infra/devstack-gate
+      devstack_local_conf:
-      - openstack/heat
+        post-config:
-      - openstack/neutron-lbaas
+          $SENLIN_CONF:
-      - openstack/python-zaqarclient
+             DEFAULT:
-      - openstack/senlin
+               cloud_backend: openstack_test
-      - openstack/senlin-tempest-plugin
+               health_check_interval_min: 10
-      - openstack/tempest
-      - openstack/zaqar
-      - openstack/zaqar-ui
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^senlin/tests/unit/.*$
-      - ^releasenotes/.*$
 
 - job:
     name: senlin-dsvm-tempest-py35-integration
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
-    run: playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
+    vars:
-    post-run: playbooks/legacy/senlin-dsvm-tempest-py35-integration/post.yaml
+      tempest_test_regex: senlin_tempest_plugin.tests.integration
-    timeout: 7800
+      devstack_plugins:
+        zaqar: https://git.openstack.org/openstack/zaqar
+        heat: https://git.openstack.org/openstack/heat
+      devstack_localrc:
+        USE_PYTHON3: true
+        TEMPEST_PLUGINS: '"/opt/stack/senlin-tempest-plugin /opt/stack/zaqar-tempest-plugin"'
+      devstack_local_conf:
+        post-config:
+          $SENLIN_CONF:
+             DEFAULT:
+               health_check_interval_min: 10
     required-projects:
-      - openstack-infra/devstack-gate
       - openstack/heat
-      - openstack/neutron-lbaas
+      - openstack/octavia
       - openstack/python-zaqarclient
       - openstack/senlin
       - openstack/senlin-tempest-plugin
-      - openstack/tempest
       - openstack/zaqar
       - openstack/zaqar-ui
       - openstack/zaqar-tempest-plugin
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^senlin/tests/unit/.*$
-      - ^releasenotes/.*$
 
 - job:
     name: rally-dsvm-senlin-senlin
-    parent: legacy-dsvm-base
+    parent: senlin-tempest-base
     run: playbooks/legacy/rally-dsvm-senlin-senlin/run.yaml
     post-run: playbooks/legacy/rally-dsvm-senlin-senlin/post.yaml
-    timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/aodh

playbooks/legacy/senlin-dsvm-tempest-py27-api/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py27-api/run.yaml

@@ -1,80 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py27-api
-  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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=False
-          export SENLIN_TEST_TYPE="api"
-          export SENLIN_BACKEND="openstack_test"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.api"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-            services+=,placement-api,placement-client
-          fi
-          # services+=,c-sch,c-api,c-vol,c-bak
-          services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'

playbooks/legacy/senlin-dsvm-tempest-py27-functional/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml

@@ -1,80 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py27-functional
-  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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=False
-          export SENLIN_TEST_TYPE="functional"
-          export SENLIN_BACKEND="openstack_test"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.functional"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-            services+=,placement-api,placement-client
-          fi
-          services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'

playbooks/legacy/senlin-dsvm-tempest-py27-integration/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml

@@ -1,99 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py27-integration-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-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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=False
-
-          export SENLIN_TEST_TYPE="integration"
-          export SENLIN_BACKEND="openstack"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.integration"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-             services+=,placement-api,placement-client
-          fi
-          # services+=,c-sch,c-api,c-vol,c-bak
-          services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
-          export PROJECTS="openstack/heat $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
-          # Enable LBaaS V2 plugin
-          services+=,q-lbaasv2
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
-          # Enable Zaqar
-          export PROJECTS="openstack/zaqar $PROJECTS"
-          export PROJECTS="openstack/python-zaqarclient $PROJECTS"
-          export PROJECTS="openstack/zaqar-ui $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
-          export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
-
-          # use senlin-tempest-plugin
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'

playbooks/legacy/senlin-dsvm-tempest-py35-api/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py35-api/run.yaml

@@ -1,82 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py35-api-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-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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export SENLIN_TEST_TYPE="api"
-          export SENLIN_BACKEND="openstack_test"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.api"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-            services+=,placement-api,placement-client
-          fi
-          # services+=,c-sch,c-api,c-vol,c-bak
-          # services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
-          # use senlin-tempest-plugin
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'

playbooks/legacy/senlin-dsvm-tempest-py35-functional/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml

@@ -1,81 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py35-functional
-  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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-
-          export SENLIN_TEST_TYPE="functional"
-          export SENLIN_BACKEND="openstack_test"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.functional"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-            services+=,placement-api,placement-client
-          fi
-          services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'

playbooks/legacy/senlin-dsvm-tempest-py35-integration/post.yaml

@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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

playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml

@@ -1,99 +0,0 @@
-- hosts: all
-  name: gate-senlin-dsvm-tempest-py35-integration-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-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_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export KEEP_LOCALRC=1
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-
-          export SENLIN_TEST_TYPE="integration"
-          export SENLIN_BACKEND="openstack"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.integration"
-
-          services=rabbit,mysql,dstat,key,tempest
-          services+=,g-api,g-reg
-          services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-             services+=,placement-api,placement-client
-          fi
-          # services+=,c-sch,c-api,c-vol,c-bak
-          services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
-          export PROJECTS="openstack/heat $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
-          # Enable LBaaS V2 plugin
-          services+=,q-lbaasv2
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
-          # Enable Zaqar
-          export PROJECTS="openstack/zaqar $PROJECTS"
-          export PROJECTS="openstack/python-zaqarclient $PROJECTS"
-          export PROJECTS="openstack/zaqar-ui $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
-          export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
-
-          # use senlin-tempest-plugin
-          export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
-
-          export OVERRIDE_ENABLED_SERVICES=$services
-
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
-              source ./post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          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 }}'