diff --git a/jenkins/jobs/packstack.yaml b/jenkins/jobs/packstack.yaml new file mode 100644 index 0000000000..96d226fea1 --- /dev/null +++ b/jenkins/jobs/packstack.yaml @@ -0,0 +1,23 @@ +- job-template: + name: 'gate-packstack-integration-{scenario}-tempest-dsvm-{ostype}' + node: 'devstack-{ostype}' + + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - puppet-prepare-node + - gerrit-git-prep + - shell: | + #!/bin/bash -xe + export SCENARIO={scenario} + ./run_tests.sh + + wrappers: + - build-timeout: + timeout: 60 + - timestamps + + publishers: + - devstack-logs + - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index b0023abb37..172de51cbf 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4604,9 +4604,13 @@ name: packstack node: bare-trusty tarball-site: tarballs.openstack.org - + ostype: centos7 + scenario: + - scenario001 + - scenario002 jobs: - python-jobs + - 'gate-packstack-integration-{scenario}-tempest-dsvm-{ostype}' - project: name: pandaman diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8e09b34699..f6e9342b92 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -586,6 +586,11 @@ project-templates: gate: - gate-{name}-ansible-lint + - name: packstack-integration-jobs + check: + - gate-packstack-integration-scenario001-tempest-dsvm-centos7 + - gate-packstack-integration-scenario002-tempest-dsvm-centos7 + - name: puppet-beaker-jobs check: - gate-{name}-puppet-beaker-rspec-dsvm-trusty @@ -985,6 +990,12 @@ jobs: - name: propose-openstack-manuals-updates branch: master + # First implementation of packstack integration jobs should be non-voting + # and only on the master branch + - name: ^gate-packstack-integration-scenario00(1|2)-tempest-dsvm-centos7$ + voting: false + branch: master + - name: ^gate-puppet-openstackci-puppet-beaker-rspec-dsvm-.*$ voting: false @@ -7799,6 +7810,7 @@ projects: - name: openstack/packstack template: - name: merge-check + - name: packstack-integration-jobs check: - gate-packstack-pep8 - gate-packstack-python27