diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 9b27e600c9..114bd6a319 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -170,6 +170,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CINDER=1 export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=master cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -216,6 +217,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CINDER=1 export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=master cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -237,51 +239,6 @@ recipients: david.kranz@qrclab.com -- job: - name: periodic-tempest-devstack-vm-cinder - node: devstack-precise - - wrappers: - - timeout: - timeout: 90 - fail: true - - timestamps - - triggers: - - timed: '@daily' - - builders: - - trigger-builds: - - project: devstack-update-inprogress - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_CINDER=1 - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - scp: - site: 'static.openstack.org' - files: - - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - source: 'logs/**' - keep-hierarchy: true - copy-after-failure: true - - console-log-periodic - - trigger-parameterized-builds: - - project: devstack-update-complete - when: complete - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - email: - recipients: openstack-stable-maint@lists.openstack.org - - - job: name: periodic-tempest-devstack-vm-stable-diablo node: devstack-oneiric @@ -492,6 +449,7 @@ export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_CINDER=1 export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=master cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh