diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml index b07bad6748..7afeb2f9c8 100644 --- a/jenkins/jobs/python-barbicanclient.yaml +++ b/jenkins/jobs/python-barbicanclient.yaml @@ -1,3 +1,43 @@ +- job: + name: gate-python-barbicanclient-devstack-dsvm-oldstable + node: 'devstack-precise || devstack-trusty' + + 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 ENABLED_SERVICES=barbican,tempest,keystone + export PROJECTS="openstack/barbican $PROJECTS" + export PROJECTS="openstack/python-barbicanclient $PROJECTS" + + function pre_test_hook { + cd /opt/stack/new/barbican/functionaltests + ./pre_test_hook.sh + } + export -f pre_test_hook + + function post_test_hook { + cd /opt/stack/new/python-barbicanclient/functionaltests + ./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: + - devstack-logs + - console-log + - job: name: gate-python-barbicanclient-devstack-dsvm node: 'devstack-precise || devstack-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 68f9a47008..df36f78bf9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1416,6 +1416,12 @@ jobs: - name: magnum-coverage voting: false + - name: gate-python-barbicanclient-devstack-dsvm + branch: ^(?!stable/kilo).*$ + + - name: gate-python-barbicanclient-devstack-dsvm-oldstable + branch: ^stable/kilo$ + - name: gate-barbican-devstack-dsvm branch: ^(?!stable/kilo).*$ @@ -7967,8 +7973,10 @@ projects: - name: check-requirements check: - gate-python-barbicanclient-devstack-dsvm + - gate-python-barbicanclient-devstack-dsvm-oldstable gate: - gate-python-barbicanclient-devstack-dsvm + - gate-python-barbicanclient-devstack-dsvm-oldstable - name: openstack/python-blazarclient template: