From d8ddcda9ab12e6673c7c6257263473ec54b42a35 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 7 Aug 2013 10:03:53 -0700 Subject: [PATCH] Unset ZUUL_PROJECT on periodic devstack jobs The Zuul periodic trigger sets it, but devstack-gate expects that if it is set, then ZUUL_REF will also be set, which it is not (yet). Change-Id: Id5ad96fca83c7e8c50f567fa6220ad00f1252e41 --- .../files/jenkins_job_builder/config/devstack-gate.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) 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 45912dc211..c572ae3be9 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 @@ -287,6 +287,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export ZUUL_BRANCH=stable/folsom + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -318,6 +319,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CINDER=1 export ZUUL_BRANCH=stable/folsom + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -349,6 +351,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export ZUUL_BRANCH=stable/grizzly + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -381,6 +384,7 @@ export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export ZUUL_BRANCH=stable/grizzly + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -412,6 +416,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export ZUUL_BRANCH=stable/grizzly + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -443,6 +448,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL=1 export ZUUL_BRANCH=master + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -474,6 +480,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_COVERAGE=1 export ZUUL_BRANCH=master + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -505,6 +512,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_STRESS=1 export ZUUL_BRANCH=master + unset ZUUL_PROJECT cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs