Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59556
Change subject: Replicated repositories are at /var/lib/git/*
......................................................................
Replicated repositories are at /var/lib/git/*
The repositories replicated from Gerrit to Jenkins are at
/var/lib/git/*, not /var/lib/zuul/git/*. This was causing
jobs to fail since they couldn't find references or objects
that Zuul was requesting.
Change-Id: Ieac423f7ab5a70a1cc08a585c1141e56488ff247
---
M defaults.yaml
M macro-scm.yaml
M mediawiki.yaml
M operations-debs.yaml
M operations-puppet.yaml
M parsoid.yaml
6 files changed, 12 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/56/59556/1
diff --git a/defaults.yaml b/defaults.yaml
index c7a9210..5690c3a 100644
--- a/defaults.yaml
+++ b/defaults.yaml
@@ -24,7 +24,7 @@
scm:
- git:
- url: '/var/lib/zuul/git/{gerrit-name}'
+ url: '/var/lib/git/{gerrit-name}'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -48,7 +48,7 @@
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/extensions/{ext-name}'
+ url: '/var/lib/git/mediawiki/extensions/{ext-name}'
basedir: 'extensions/{ext-name}'
branches:
- '$ZUUL_COMMIT'
diff --git a/macro-scm.yaml b/macro-scm.yaml
index 9cf712b..b006373 100644
--- a/macro-scm.yaml
+++ b/macro-scm.yaml
@@ -8,7 +8,7 @@
name: git-mwcore-nosubmodules
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/core'
+ url: '/var/lib/git/mediawiki/core'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -26,7 +26,7 @@
name: git-zuul
scm:
- git:
- url: '/var/lib/zuul/git/{gerrit-name}'
+ url: '/var/lib/git/{gerrit-name}'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -56,7 +56,7 @@
name: git-mwext-in-root
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/extensions/{ext-name}'
+ url: '/var/lib/git/mediawiki/extensions/{ext-name}'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
diff --git a/mediawiki.yaml b/mediawiki.yaml
index f3d9f87..3effe62 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -1,7 +1,7 @@
# This file holds the configuration for all MediaWiki core related jobs
# regardless of them being lint, merge check, unit test or regression testing.
-# FIXME: use /var/lib/zuul/git/{gerrit-name}
+# FIXME: use /var/lib/git/{gerrit-name}
# Note that mediawiki/core branches may have a lot of submodules, we thus
# use a specific git macro to prevents Jenkins from updating all the
diff --git a/operations-debs.yaml b/operations-debs.yaml
index 6ed304c..dc55771 100644
--- a/operations-debs.yaml
+++ b/operations-debs.yaml
@@ -4,7 +4,7 @@
name: git-deb-package
scm:
- git:
- url: '/var/lib/zuul/git/{gerrit-name}'
+ url: '/var/lib/git/{gerrit-name}'
basedir: 'packaging'
branches:
- '$ZUUL_COMMIT'
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 09d38d7..daf0fd2 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -16,7 +16,7 @@
# Zuul merge changes in the branch which is then known is the
# job workspace as origin/branch. So we have to look up the sha1
# of the original branch by querying the Zuul maintained repo
- ORIG_HEAD=`git --git-dir=/var/lib/zuul/git/operations/puppet/.git
rev-parse "origin/$ZUUL_BRANCH"`
+ ORIG_HEAD=`git --git-dir=/var/lib/git/operations/puppet/.git rev-parse
"origin/$ZUUL_BRANCH"`
echo "Original HEAD origin/$ZUUL_BRANCH points to $ORIG_HEAD"
echo "Finding out whether the rakefile has been altered.."
diff --git a/parsoid.yaml b/parsoid.yaml
index a9fd295..e76383d 100644
--- a/parsoid.yaml
+++ b/parsoid.yaml
@@ -33,7 +33,7 @@
- zuul
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/extensions/Parsoid'
+ url: '/var/lib/git/mediawiki/extensions/Parsoid'
refspec: '$ZUUL_REF'
name: 'origin'
disable-submodules: true
@@ -104,7 +104,7 @@
# - zuul
# scm:
# - git:
-# url: '/var/lib/zuul/git/mediawiki/extensions/Parsoid'
+# url: '/var/lib/git/mediawiki/extensions/Parsoid'
# refspec: '$ZUUL_REF'
# name: 'origin'
# disable-submodules: true
@@ -144,7 +144,7 @@
- zuul
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/extensions/Parsoid'
+ url: '/var/lib/git/mediawiki/extensions/Parsoid'
refspec: '$ZUUL_REF'
name: 'origin'
disable-submodules: true
@@ -175,7 +175,7 @@
- zuul
scm:
- git:
- url: '/var/lib/zuul/git/mediawiki/extensions/Parsoid'
+ url: '/var/lib/git/mediawiki/extensions/Parsoid'
refspec: '$ZUUL_REF'
name: 'origin'
disable-submodules: true
--
To view, visit https://gerrit.wikimedia.org/r/59556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieac423f7ab5a70a1cc08a585c1141e56488ff247
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
