diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 118e8b212c..feea7d0eb8 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8303,6 +8303,12 @@ node: ubuntu-trusty job-suffix: '' branch-override: default + - '{pipeline}-senlin-dsvm-tempest-{test_type}{job-suffix}': + pipeline: gate + node: ubuntu-trusty + job-suffix: '' + branch-override: default + test_type: api - translation-jobs - pypi-jobs - openstack-publish-jobs diff --git a/jenkins/jobs/senlin.yaml b/jenkins/jobs/senlin.yaml index 8a67a8c6d1..a3438b60ed 100644 --- a/jenkins/jobs/senlin.yaml +++ b/jenkins/jobs/senlin.yaml @@ -42,3 +42,57 @@ - test-results - devstack-logs - console-log + +- job-template: + name: '{pipeline}-senlin-dsvm-tempest-{test_type}{job-suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 130 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export BRANCH_OVERRIDE={branch-override} + export PROJECTS="openstack/senlin $PROJECTS" + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.{test_type}" + + export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin" + + if [ "{test_type}" == "api" ];then + export SENLIN_BACKEND="openstack_test" + else + export SENLIN_BACKEND="openstack" + fi + + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + function pre_test_hook {{ + cd /opt/stack/new/senlin/senlin/tests/tempest/ + ./pre_test_hook.sh + }} + export -f pre_test_hook + + function post_test_hook {{ + cd /opt/stack/new/senlin/senlin/tests/tempest/ + ./post_test_hook.sh + }} + export -f post_test_hook + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - test-results + - devstack-logs + - console-log diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e830b3d05f..8fd1fbfdb1 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2782,6 +2782,9 @@ jobs: - name: gate-senlin-dsvm-functional voting: false + - name: gate-senlin-dsvm-tempest-api + voting: false + - name: gate-scalpels-dsvm-neutron-ubuntu-trusty voting: false @@ -11174,6 +11177,7 @@ projects: experimental: - gate-senlin-dsvm-functional - gate-rally-dsvm-senlin + - gate-senlin-dsvm-tempest-api - name: openstack/senlin-dashboard template: