Merge "Add diskimage-builder to the list of libraries"

Jenkins · openstack-gerrit · commit dab2f8b5ab4b · 2016-02-11T02:33:14.000Z
diff --git a/stackrc b/stackrc
@@ -483,6 +483,10 @@ GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}
 # this doesn't exist in a lib file, so set it here
 GITDIR["ironic-lib"]=$DEST/ironic-lib
 
+# diskimage-builder tool
+GITREPO["diskimage-builder"]=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
+GITBRANCH["diskimage-builder"]=${DIB_BRANCH:-master}
+GITDIR["diskimage-builder"]=$DEST/diskimage-builder
 
 ##################
 #
diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh
@@ -42,6 +42,7 @@ ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
 ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
 ALL_LIBS+=" oslo.cache oslo.reports osprofiler"
 ALL_LIBS+=" keystoneauth ironic-lib oslo.privsep"
+ALL_LIBS+=" diskimage-builder"
 
 # Generate the above list with
 # echo ${!GITREPO[@]}

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,10 @@ GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}`
`483`	`483`	`# this doesn't exist in a lib file, so set it here`
`484`	`484`	`GITDIR["ironic-lib"]=$DEST/ironic-lib`
`485`	`485`
	`486`	`+# diskimage-builder tool`
	`487`	`+GITREPO["diskimage-builder"]=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}`
	`488`	`+GITBRANCH["diskimage-builder"]=${DIB_BRANCH:-master}`
	`489`	`+GITDIR["diskimage-builder"]=$DEST/diskimage-builder`
`486`	`490`
`487`	`491`	`##################`
`488`	`492`	`#`