From e298e4367467d8397611933a883f41aba83a5c98 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Tue, 14 Nov 2017 11:51:14 -0500 Subject: [PATCH] Test os-brick master in LIO gate job Pull os-brick from git instead of pip when testing on master. For stable branches, still pull os-brick from pip. Change-Id: Ib9ebfa67020d99d83ebb33552677e9e2e334f9a7 --- playbooks/legacy/cinder-tempest-dsvm-lvm-lio/run.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio/run.yaml b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio/run.yaml index fe0b1cbb7aa..109a8426358 100644 --- a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio/run.yaml +++ b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio/run.yaml @@ -46,6 +46,11 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PYTHONUNBUFFERED=true + if [ "$ZUUL_BRANCH" == "master" ]; then + # Use os-brick head for master, use os-brick from + # pip for stable branches. + export DEVSTACK_PROJECT_FROM_GIT=os-brick + fi export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need to add