...
|
...
|
@@ -499,7 +499,7 @@ GITBRANCH["tooz"]=${TOOZ_BRANCH:-$TARGET_BRANCH}
|
499
|
499
|
|
500
|
500
|
# pbr drives the setuptools configs
|
501
|
501
|
GITREPO["pbr"]=${PBR_REPO:-${GIT_BASE}/openstack/pbr.git}
|
502
|
|
-GITBRANCH["pbr"]=${PBR_BRANCH:-$TARGET_BRANCH}
|
|
502
|
+GITBRANCH["pbr"]=${PBR_BRANCH:-$BRANCHLESS_TARGET_BRANCH}
|
503
|
503
|
|
504
|
504
|
|
505
|
505
|
##################
|
...
|
...
|
@@ -554,7 +554,7 @@ GITDIR["ironic-lib"]=$DEST/ironic-lib
|
554
|
554
|
|
555
|
555
|
# diskimage-builder tool
|
556
|
556
|
GITREPO["diskimage-builder"]=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
|
557
|
|
-GITBRANCH["diskimage-builder"]=${DIB_BRANCH:-$TARGET_BRANCH}
|
|
557
|
+GITBRANCH["diskimage-builder"]=${DIB_BRANCH:-$BRANCHLESS_TARGET_BRANCH}
|
558
|
558
|
GITDIR["diskimage-builder"]=$DEST/diskimage-builder
|
559
|
559
|
|
560
|
560
|
# neutron-lib library containing neutron stable non-REST interfaces
|