openstack
/
project-config
Code Issues Proposed changes

Use DEVSTACK_PROJECT_FROM_GIT (2/2) 

Use devstack-gate variable DEVSTACK_PROJECT_FROM_GIT everywhere
instead of devstack variable LIBS_FROM_GIT.

Simplify code, we do not need to set PROJECTS in this case anymore.

This change updates jobs that use openstack-infra repos in
DEVSTACK_PROJECT_FROM_GIT.

Change-Id: I27ce27f54e78abc71d4329eb97415ef5dc6e4db3
Depends-On: I1a6fb66e25301c6e7f85cf81cf5259192276c437
This commit is contained in:
Andreas Jaeger 2017-04-30 16:54:00 +02:00
parent 0109c93059
commit 1a9784d8c5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/nodepool.yaml
View File

@ -100,15 +100,14 @@
# Because we are testing a non standard project, add the
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack-infra/glean $PROJECTS"
export PROJECTS="openstack-infra/nodepool $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export PROJECTS="openstack/diskimage-builder $PROJECTS"
# note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin nodepool git://git.openstack.org/openstack-infra/nodepool"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade"
export DEVSTACK_PROJECT_FROM_GIT="diskimage-builder"
export DEVSTACK_PROJECT_FROM_GIT+=",glean"
export DEVSTACK_PROJECT_FROM_GIT+=",shade"
# Start with all images disabled.
export NODEPOOL_PAUSE_CENTOS_7_DIB=true

7
jenkins/jobs/oaktree.yaml
View File

@ -83,10 +83,9 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin oaktree git://git.openstack.org/openstack/oaktree"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=shade,oaktree,oaktreemodel"
export PROJECTS="openstack/oaktree $PROJECTS"
export PROJECTS="openstack/oaktreemodel $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="shade"
export DEVSTACK_PROJECT_FROM_GIT+=",oaktree"
export DEVSTACK_PROJECT_FROM_GIT+=",oaktreemodel"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then