From c2b77ea754da97fd5c0dd01f2159086871b28a76 Mon Sep 17 00:00:00 2001
From: Renat Akhmerov <renat.akhmerov@gmail.com>
Date: Tue, 23 Jan 2018 09:27:50 +0000
Subject: [PATCH] Revert "Add zuul jobs for mistral-tempest-plugin"

This reverts commit 09370b7a5173c33965ff8da9f752ec8f21896963.

Change-Id: Ib39ef56a6aea7b896daa0accb15f21a433ebd09a
---
 .zuul.yaml                                    | 73 -------------------
 .../engine/actions/v2/test_ssh_actions.py     | 21 ++++--
 playbooks/tempest/pre.yaml                    | 10 ---
 3 files changed, 14 insertions(+), 90 deletions(-)
 delete mode 100644 .zuul.yaml
 delete mode 100644 playbooks/tempest/pre.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
deleted file mode 100644
index 3f59bc1..0000000
--- a/.zuul.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: mistral-devstack-tempest-base
-    parent: devstack-tempest
-    pre-run: playbooks/tempest/pre.yaml
-    timeout: 9000
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/heat
-      - openstack/mistral
-      - openstack/mistral-lib
-      - openstack/mistral-tempest-plugin
-      - openstack/python-mistralclient
-      - openstack/tempest
-      - openstack/zaqar
-      - openstack/python-zaqarclient
-    vars:
-      tox_envlist: all
-      tempest_test_regex: mistral
-      devstack_localrc:
-        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/mistral-tempest-plugin'"
-        SWIFT_HASH: secrethash
-        MYSQL_ROOT_PW: secretdatabase
-        MISTRAL_USE_MOD_WSGI: True
-        MISTRAL_RPC_IMPLEMENTATION: oslo
-      devstack_services:
-        heat: True
-        h-api: True
-        h-api-cfn: True
-        h-api-cw: True
-        h-eng: True
-        s-proxy: True
-        s-object: True
-        s-container: True
-        s-account: True
-        tempest: True
-      devstack_plugins:
-        mistral: https://git.openstack.org/openstack/mistral
-        heat: https://git.openstack.org/openstack/heat
-        zaqar: https://git.openstack.org/openstack/zaqar
-
-- job:
-    name: mistral-devstack
-    parent: mistral-devstack-tempest-base
-
-- job:
-    name: mistral-devstack-kombu
-    parent: mistral-devstack-tempest-base
-    vars:
-      devstack_localrc:
-        MISTRAL_RPC_IMPLEMENTATION: kombu
-
-- job:
-    name: mistral-devstack-non-apache
-    parent: mistral-devstack-tempest-base
-    vars:
-      devstack_localrc:
-        MISTRAL_USE_MOD_WSGI: False
-
-- project:
-    name: openstack/mistral-tempest-plugin
-    check:
-      jobs:
-        - mistral-devstack
-        - mistral-devstack-non-apache:
-            branches: ^(?!stable/(newton|ocata)).*$
-        - mistral-devstack-kombu:
-            branches: ^(?!stable/newton).*$
-    gate:
-      jobs:
-        - mistral-devstack
-        - mistral-devstack-non-apache
-        - mistral-devstack-kombu
diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
index a4c038e..b83f4a7 100644
--- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
+++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
@@ -157,17 +157,24 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
         self.private_key, self.public_key = utils.generate_key_pair()
         self.key_name = 'mistral-functional-tests-key'
 
-        self.key_dir = SSH_KEYS_DIRECTORY
+        # If ZUUL_PROJECT is specified, it means
+        # tests are running on Jenkins gate.
 
-        self.key_path = self.key_dir + self.key_name
+        if os.environ.get('ZUUL_PROJECT'):
+            self.key_dir = "/opt/stack/new/.ssh/"
+
+            if not path.exists(self.key_dir):
+                os.mkdir(self.key_dir)
+        else:
+            self.key_dir = SSH_KEYS_DIRECTORY
 
         utils.save_text_to(
             self.private_key,
-            self.key_path,
+            self.key_dir + self.key_name,
             overwrite=True
         )
 
-        LOG.info("Private key saved to %s", self.key_path)
+        LOG.info("Private key saved to %s", self.key_dir + self.key_name)
 
         # Create keypair in nova.
         self.mgr.keypairs_client.create_keypair(
@@ -226,7 +233,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
         mgr.compute_security_group_rules_client.delete_security_group_rule(
             self.ssh_rule_id
         )
-        os.remove(self.key_path)
+        os.remove(self.key_dir + self.key_name)
 
         super(SSHActionsTestsV2, self).tearDown()
 
@@ -237,7 +244,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
             'cmd': 'hostname',
             'host': self.public_vm_ip,
             'username': CONF.validation.image_ssh_user,
-            'private_key_filename': self.key_path
+            'private_key_filename': self.key_name
         }
 
         resp, body = self.client.create_action_execution(
@@ -263,7 +270,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
             'cmd': 'hostname',
             'host': guest_vm_ip,
             'username': CONF.validation.image_ssh_user,
-            'private_key_filename': self.key_path,
+            'private_key_filename': self.key_name,
             'gateway_host': self.public_vm_ip,
             'gateway_username': CONF.validation.image_ssh_user
         }
diff --git a/playbooks/tempest/pre.yaml b/playbooks/tempest/pre.yaml
deleted file mode 100644
index 521d4d3..0000000
--- a/playbooks/tempest/pre.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: tempest
-  tasks:
-    - name: Create .ssh dir and make it available to stack and tempest user
-      file:
-        path: /home/tempest/.ssh
-        state: directory
-        mode: u=rwx,g=rwx,o=rx,g+s
-        owner: tempest
-        group: stack
-      become: yes