jenkins-bot has submitted this change and it was merged.
Change subject: Zuul layout.yaml got moved to /zuul/ subdir
......................................................................
Zuul layout.yaml got moved to /zuul/ subdir
Has been done to prepare the merge of the repositories
integration/zuul-config and integration/jenkins-job-builder-config
There is a symbolic link left behind but lets rename it now rather than
being sorry later on.
zuul-config change is:
https://gerrit.wikimedia.org/r/#/c/165745/
Change-Id: I9225257261c9d5cac6338f249f3ddbb0d91810c8
---
M integration.yaml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/integration.yaml b/integration.yaml
index 6b3c154..bddec2b 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -20,7 +20,7 @@
git checkout $ZUUL_COMMIT
echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
-# Pass zuul-config.git:layout.yaml to zuul-server layout validation
+# Pass zuul-config.git:zuul/layout.yaml to zuul-server layout validation
# Requires zuul to be installed on the Jenkins host.
- job-template:
name: 'integration-zuul-layoutvalidation'
@@ -35,7 +35,7 @@
python
/srv/deployment/integration/slave-scripts/bin/jenkins-jobs-list.py >
jenkins_jobs.txt
# FIXME change path whenever we have zuul packaged.
- /usr/local/bin/zuul-server -t jenkins_jobs.txt -l
"$WORKSPACE"/layout.yaml
+ /usr/local/bin/zuul-server -t jenkins_jobs.txt -l
"$WORKSPACE"/zuul/layout.yaml
# Job for Zuul configuration validation
# Make sure the Zuul config is passed and show a different with the previous
@@ -51,9 +51,9 @@
- shell: |
set +e
# FIXME change path whenever we have zuul packaged.
- /usr/local/bin/zuul-server -t -l "$WORKSPACE"/layout.yaml 2>current.txt
+ /usr/local/bin/zuul-server -t -l "$WORKSPACE"/zuul/layout.yaml
2>current.txt
git checkout HEAD^
- /usr/local/bin/zuul-server -t -l "$WORKSPACE"/layout.yaml 2>before.txt
+ /usr/local/bin/zuul-server -t -l "$WORKSPACE"/zuul/layout.yaml
2>before.txt
colordiff -u before.txt current.txt
- job-template:
--
To view, visit https://gerrit.wikimedia.org/r/165747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9225257261c9d5cac6338f249f3ddbb0d91810c8
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
