From e7ec0ed85cc8583c109af873ab3014b5fd7f1ad0 Mon Sep 17 00:00:00 2001
From: David Moreau-Simard <dms@redhat.com>
Date: Thu, 9 Jun 2016 10:13:16 -0400
Subject: [PATCH] Move ARA integration jobs to use ./run_tests.sh instead

Moving to the shell macro and using run_tests.sh will grant us
increased flexibility around how the integration jobs are run.
It will also provide us with the ability to easily change the
tests without having to rely on jenkins job changes.

Change-Id: Ibd0f7939c3b059deaa3f2f7a2ec8f7ca8a858b6f
---
 jenkins/jobs/ara.yaml      | 7 ++++---
 jenkins/jobs/projects.yaml | 3 +--
 zuul/layout.yaml           | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml
index 4060db75ab..67ba4d5d23 100644
--- a/jenkins/jobs/ara.yaml
+++ b/jenkins/jobs/ara.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-ara-integration-{scenario}-{ostype}'
+    name: 'gate-ara-integration-{ostype}'
     node: '{ostype}'
     builders:
       - print-template-name:
@@ -7,8 +7,9 @@
       - link-logs
       - gerrit-git-prep
       - install-distro-packages
-      - tox:
-          envlist: "integration-{scenario}"
+      - shell: |
+          #!/bin/bash -xe
+          ./run_tests.sh
     wrappers:
       - build-timeout:
           timeout: 20
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 8b3e875240..c245a7cbd3 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -203,10 +203,9 @@
     ostype:
       - centos-7
       - ubuntu-trusty
-    scenario: smoke
     jobs:
       - python-jobs
-      - 'gate-ara-integration-{scenario}-{ostype}'
+      - 'gate-ara-integration-{ostype}'
 
 - project:
     name: astara
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d03efe7263..d04772f3a0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4574,12 +4574,12 @@ projects:
       - name: merge-check
       - name: python-jobs
     check:
-      - gate-ara-integration-smoke-centos-7
-      - gate-ara-integration-smoke-ubuntu-trusty
+      - gate-ara-integration-centos-7
+      - gate-ara-integration-ubuntu-trusty
       - ara-coverage
     gate:
-      - gate-ara-integration-smoke-centos-7
-      - gate-ara-integration-smoke-ubuntu-trusty
+      - gate-ara-integration-centos-7
+      - gate-ara-integration-ubuntu-trusty
     post:
       - ara-coverage