Merge "Move ARA integration jobs to use ./run_tests.sh instead"

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

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

zuul/layout.yaml

@@ -4570,12 +4570,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