jenkins-bot has submitted this change and it was merged. Change subject: Zuul public.conf is gone ......................................................................
Zuul public.conf is gone The default /etc/zuul/zuul.conf is made readable with https://gerrit.wikimedia.org/r/162584 and removes public.conf entirely. The private server file is made zuul-server.conf which we do not need for layout validation. Change-Id: I954e557aee2b62d2e40ef779daab7f04d8bdb004 --- M integration.yaml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/integration.yaml b/integration.yaml index 05e0937..6ee8d0b 100644 --- a/integration.yaml +++ b/integration.yaml @@ -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 -c /etc/zuul/public.conf -t jenkins_jobs.txt -l "$WORKSPACE"/layout.yaml + /usr/local/bin/zuul-server -t jenkins_jobs.txt -l "$WORKSPACE"/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 -c /etc/zuul/public.conf -t -l "$WORKSPACE"/layout.yaml 2>current.txt + /usr/local/bin/zuul-server -t -l "$WORKSPACE"/layout.yaml 2>current.txt git checkout HEAD^ - /usr/local/bin/zuul-server -c /etc/zuul/public.conf -t -l "$WORKSPACE"/layout.yaml 2>before.txt + /usr/local/bin/zuul-server -t -l "$WORKSPACE"/layout.yaml 2>before.txt colordiff -u before.txt current.txt - job-template: -- To view, visit https://gerrit.wikimedia.org/r/162585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I954e557aee2b62d2e40ef779daab7f04d8bdb004 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
