diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index fb7145fe18..3cd2cc6982 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1769,7 +1769,11 @@ - python-jobs - pypi-jobs - openstack-publish-jobs - - 'lib-forward-testing-{name}' + - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{branch-designator}': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + branch-designator: '' + branch-override: default - '{pipeline}-saharaclient-dsvm-functional{branch-designator}': pipeline: gate node: 'devstack-precise || devstack-trusty' diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 6fff1f0c3c..ae91f4f90c 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -237,3 +237,37 @@ publishers: - devstack-logs - console-log + + +- job-template: + name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export DEVSTACK_GATE_NEUTRON=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient + 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