Browse code
Fix target branch for pbr and diskimage-builder
The target branch was centralized in change
I82aa19e739eeda3721bac1cb5153ad0bf2d1125a but there
are two issues, pbr and diskimage-builder are using
TARGET_BRANCH which gets changed to stable/* for
each openstack stable branch that gets created for
devstack, e.g. I861068ae1a9902cef61c52c70dda7bb42f4371a0,
but pbr and diskimage-builder don't have stable branches
so they should be using BRANCHLESS_TARGET_BRANCH i.e. master.
Change-Id: I47ac7a7e194ca6d613d0ccaebfd557346644c2df
Matt Riedemann authored on 2019/09/25 23:31:09Showing 1 changed files
| ... | ... |
@@ -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 |