From 4805d2ea5ea464eea1a09650ed829f4c8c12052c Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 17 Sep 2019 04:33:53 +0000
Subject: [PATCH] [train][goal] Define new 'mistral-devstack-tempest-ipv6-only'
 job

As part of Train community goal 'Support IPv6-Only Deployments and Testing'[1],
Tempest has defined the base job 'devstack-tempest-ipv6' which will
deploy services on IPv6.

This commit adds the new job 'mistral-devstack-tempest-ipv6-only'
run on gate which is derived from 'devstack-tempest-ipv6'.

Verification structure will be:
- 'devstack-IPv6' deploy the service on IPv6
- 'devstack-tempest-ipv6' run will verify the IPv6-only setting and listen address
- 'mistral-devstack-tempest-ipv6-only' will run the tests.
- 'mistral-devstack-non-apache-tempest-ipv6-only' will run the tests.

Story: #2005477
Task: #35905

Depends-On: https://review.opendev.org/#/c/699959/

[1] https://governance.openstack.org/tc/goals/train/ipv6-support-and-testing.html

Change-Id: Iacd2d9cb5effde9a801010ce3e5f590f47f8831e
---
 .zuul.yaml                                    | 30 +++++++++++++++----
 .../actions/v2/test_openstack_actions.py      | 10 -------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 266cdbd..a0b5205 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
     parent: devstack-tempest
     pre-run: playbooks/tempest/pre.yaml
     timeout: 9000
-    required-projects:
+    required-projects: &base_required_projects
       - openstack/devstack
       - openstack/devstack-gate
       - openstack/heat
@@ -12,9 +12,7 @@
       - openstack/mistral-tempest-plugin
       - openstack/python-mistralclient
       - openstack/tempest
-      - openstack/zaqar
-      - openstack/python-zaqarclient
-    vars:
+    vars: &base_vars
       tox_envlist: all
       tempest_test_regex: mistral
       devstack_localrc:
@@ -38,7 +36,25 @@
       devstack_plugins:
         mistral: https://opendev.org/openstack/mistral
         heat: https://opendev.org/openstack/heat
-        zaqar: https://opendev.org/openstack/zaqar
+
+- job:
+    name: mistral-devstack-tempest-ipv6-only
+    parent: devstack-tempest-ipv6
+    description: |
+      Mistral devstack tempest tests job for IPv6-only deployment
+    pre-run: playbooks/tempest/pre.yaml
+    timeout: 9000
+    required-projects: *base_required_projects
+    vars: *base_vars
+
+- job:
+    name: mistral-devstack-non-apache-tempest-ipv6-only
+    parent: mistral-devstack-tempest-ipv6-only
+    description: |
+      Mistral devstack non apache tempest tests job for IPv6-only deployment
+    vars:
+      devstack_localrc:
+        MISTRAL_USE_MOD_WSGI: false
 
 - job:
     name: mistral-devstack
@@ -66,6 +82,8 @@
     check:
       jobs:
         - mistral-devstack
+        - mistral-devstack-tempest-ipv6-only
+        - mistral-devstack-non-apache-tempest-ipv6-only
         - mistral-devstack-non-apache:
             branches: ^(?!stable/(newton|ocata)).*$
         - mistral-devstack-kombu:
@@ -74,5 +92,7 @@
       queue: mistral
       jobs:
         - mistral-devstack
+        - mistral-devstack-tempest-ipv6-only
+        - mistral-devstack-non-apache-tempest-ipv6-only
         - mistral-devstack-non-apache
         - mistral-devstack-kombu
diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py
index 258ad55..76ede48 100644
--- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py
+++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py
@@ -107,13 +107,3 @@ class OpenStackActionsTestsV2(base.TestCase):
         executed_task = self.client.get_wf_tasks(wf_name)[-1]
 
         self.assertEqual('SUCCESS', executed_task['state'])
-
-    @decorators.attr(type='openstack')
-    @decorators.idempotent_id('6f000ae8-3f41-49bd-b7a7-ad2256d80076')
-    def test_zaqar_actions(self):
-        wf_name = self.wb['name'] + '.zaqar'
-        _, execution = self.client.create_execution(wf_name)
-        self.client.wait_execution_success(execution)
-        executed_task = self.client.get_wf_tasks(wf_name)[-1]
-
-        self.assertEqual('SUCCESS', executed_task['state'])