diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index 5d6186fdf0..4c41d73b20 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -59,3 +59,41 @@ publishers: - devstack-logs - console-log + + +- job-template: + name: '{pipeline}-ceilometerclient-dsvm-functional{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 65 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 + export BRANCH_OVERRIDE={branch-override} + export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + function post_test_hook {{ + # Configure and run functional tests + $BASE/new/python-ceilometerclient/ceilometerclient/tests/functional/hooks/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/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 7bb97e4585..4ed22db911 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -697,6 +697,11 @@ - pypi-jobs - 'stable-compat-jobs-{name}' - 'lib-forward-testing-{name}' + - '{pipeline}-ceilometerclient-dsvm-functional{branch-designator}': + pipeline: check + node: 'devstack-precise || devstack-trusty' + branch-designator: '' + branch-override: default - project: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 977f76d3c0..5239f44055 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -952,6 +952,8 @@ jobs: branch: ^(?!stable/(icehouse|juno)).*$ - name: gate-ceilometer-python34 branch: ^master$ + - name: ^(gate|check)-ceilometerclient-dsvm-functional$ + voting: false - name: gate-nova-pip-missing-reqs voting: false - name: gate-nova-tox-functional @@ -1768,6 +1770,8 @@ projects: - name: lib-forward-testing post: - python-ceilometerclient-coverage + experimental: + - check-ceilometerclient-dsvm-functional - name: openstack/python-cinderclient template: