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