Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300567
Change subject: (DO NOT MERGE) fetch proper repo/heads
......................................................................
(DO NOT MERGE) fetch proper repo/heads
Cloning from the zuul-merger is wrong, the heads are not pointing at the
proper commits due to random merges occuring. Have to clone from the
canonical repo (Gerrit), then fetch the patch.
Bug: T117869
Change-Id: I7d5b3ffaaea336cc0580e0bb29c078dc02ef2035
---
M jjb/operations-debs.yaml
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/67/300567/1
diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index efc6090..1243f44 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -95,20 +95,22 @@
scm:
- git:
- url: '$ZUUL_URL/$ZUUL_PROJECT'
+ url: 'https://gerrit.wikimedia.org/r/p/$ZUUL_PROJECT'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
# Git plugin would set GIT_BRANCH=detached which confuses debian glue
# Will override it as a workaround
- local-branch: $ZUUL_REF
+ local-branch: '$ZUUL_REF'
basedir: 'source'
wipe-workspace: true
- shallow-clone: true
submodule:
disable: true
builders:
- shell: |
+ cd source
+ git fetch "$ZUUL_URL"/"$ZUUL_PROJECT" "$ZUUL_REF" && git checkout
-f "$ZUUL_REF" FETCH_HEAD
+ - shell: |
# GIT_BRANCH is set to 'detached' :-(
export GIT_BRANCH="$ZUUL_REF"
if [ "$ZUUL_PIPELINE" == "gate-and-submit" ]; then
--
To view, visit https://gerrit.wikimedia.org/r/300567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d5b3ffaaea336cc0580e0bb29c078dc02ef2035
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
