Optimize the tempest job for zaqar-tempest-plugin

No need to copy the playbooks from zaqar, just use 'parent'.

Change-Id: I979c9c94bf5a3662bc9d5f0312b2abb6fa936d7e

.zuul.yaml

@@ -1,34 +1,18 @@
-- job:
-    name: zaqar-tempest-plugin-tempest-base
-    parent: legacy-dsvm-base
-    irrelevant-files:
-      - ^(test-|)requirements.txt$
-      - ^setup.cfg$
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/python-zaqarclient
-      - openstack/tempest
-      - openstack/zaqar
-      - openstack/zaqar-tempest-plugin
-    run: playbooks/legacy/tempest-devstack-zaqar-base/run.yaml
-    post-run: playbooks/legacy/tempest-devstack-zaqar-base/post.yaml
-    timeout: 7800
-
 - job:
     name: zaqar-tempest-plugin-tempest-mongodb
-    parent: zaqar-tempest-plugin-tempest-base
+    parent: zaqar-tempest-base
     vars:
       database_backend: mongodb
 
 - job:
     name: zaqar-tempest-plugin-tempest-redis
-    parent: zaqar-tempest-plugin-tempest-base
+    parent: zaqar-tempest-base
     vars:
       database_backend: redis
 
 - job:
     name: zaqar-tempest-plugin-tempest-swift
-    parent: zaqar-tempest-plugin-tempest-base
+    parent: zaqar-tempest-base
     vars:
       database_backend: swift
 

playbooks/legacy/tempest-devstack-zaqar-base/post.yaml

@@ -1,80 +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/tmp*
-          - --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/tempest-devstack-zaqar-base/run.yaml

@@ -1,63 +0,0 @@
-- hosts: all
-  name: Tempest Devstack Zaqar Base
-  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]]
-          enable_plugin zaqar https://opendev.org/openstack/zaqar
-           # Enable Zaqar Tempest plugin
-          TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin'
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PROJECTS="openstack/python-zaqarclient $PROJECTS"
-          export PYTHONUNBUFFERED=true
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_GATE_TEMPEST_REGEX="zaqar_tempest_plugin.tests"
-          export DEVSTACK_GATE_TEMPEST=0
-
-          function gate_hook {
-              cd /opt/stack/new/zaqar/devstack/gate
-              ./gate_hook.sh tempest "{{ database_backend }}"
-          }
-
-          export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
-          export -f gate_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 }}'