From b0dac613bb1df2ac1e26c8a1bb1794ac8aad0dc9 Mon Sep 17 00:00:00 2001
From: elajkat <lajos.katona@est.tech>
Date: Mon, 21 Sep 2020 10:20:12 +0200
Subject: [PATCH] Change tempest job to run on Ubuntu Focal

Change tempest job to use focal nodeset and change it from legacy job.

Change-Id: Iabfce679abba6e2d99a8eed7308bb6307288d326
---
 .zuul.yaml                                    | 22 +++++--
 .../tempest-dsvm-tap-as-a-service/post.yaml   | 15 -----
 .../tempest-dsvm-tap-as-a-service/run.yaml    | 62 -------------------
 3 files changed, 16 insertions(+), 83 deletions(-)
 delete mode 100644 playbooks/legacy/tempest-dsvm-tap-as-a-service/post.yaml
 delete mode 100644 playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index e2fd4c26..e8ce1ada 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,20 +8,30 @@
       - tap-as-a-service-tempest-plugin-jobs
     check:
       jobs:
-        - tap-as-a-service-tempest-dsvm
+        - tap-as-a-service-tempest
     gate:
       jobs:
-        - tap-as-a-service-tempest-dsvm
+        - tap-as-a-service-tempest
 
 - job:
-    name: tap-as-a-service-tempest-dsvm
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-tap-as-a-service/post.yaml
+    name: tap-as-a-service-tempest
+    parent: devstack-tempest
+    nodeset: openstack-single-node-focal
     timeout: 7800
+    vars:
+      TAAS_SERVICE_DRIVER: "TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default"
+      tox_envlist: all
+      devstack_services:
+        taas: true
+      devstack_plugins:
+        tap-as-a-service: https://opendev.org/x/tap-as-a-service
+      tempest_plugins:
+        - tap-as-a-service-tempest-plugin
+      tempest_test_regex: (^tempest|^neutron_taas_tempest_plugin)
     required-projects:
       - openstack/devstack-gate
       - x/tap-as-a-service
+      - x/tap-as-a-service-tempest-plugin
       - openstack/tempest
     irrelevant-files:
       - ^(test-|)requirements.txt$
diff --git a/playbooks/legacy/tempest-dsvm-tap-as-a-service/post.yaml b/playbooks/legacy/tempest-dsvm-tap-as-a-service/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-tap-as-a-service/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/tempest-dsvm-tap-as-a-service/run.yaml b/playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml
deleted file mode 100644
index f75d4097..00000000
--- a/playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-tap-as-a-service from old job gate-tempest-dsvm-tap-as-a-service
-  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 tap-as-a-service https://opendev.org/x/tap-as-a-service
-
-          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=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          # Enable tap-as-a-service
-          export PROJECTS="x/tap-as-a-service $PROJECTS"
-          export ENABLED_SERVICES=taas,taas_agent
-
-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/tap-as-a-service/devstack/devstackgaterc
-
-          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 }}'