jenkins-bot has submitted this change and it was merged.
Change subject: Only test Jenkins jobs existence on gate-and-submit
......................................................................
Only test Jenkins jobs existence on gate-and-submit
Whenever someone propose a change that introduces new jobs, the
integration-zuul-layoutvalidation jobs fails because the job are not
found in Jenkins. That is to be expected since the change is proposing
to add them.
The failure has confused a few people recently. I originally introduced
it to prevent Zuul configuration changes to be merged/deployed while
jobs are not deployed.
Remove the validation against Jenkins when patches are proposed (test
pipeline).
On gate, use a new job that does assert the jobs exists.
This way, if someone forget to deploy the jobs but +2 the change, it
will not land remembering people to do the deploy.
Change-Id: Id8f8eecc5ded1a77b120df090db9100f142b99d9
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 13 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 4951949..456b88b 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -31,10 +31,19 @@
- zuul
builders:
- shell: |
+ /usr/local/bin/zuul-server -l "$WORKSPACE"/zuul/layout.yaml
+
+- job-template:
+ name: 'integration-zuul-layoutvalidation-gate'
+ node: gallium # it is running Zuul
+ defaults: use-remote-zuul
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - shell: |
rm -f jenkins_jobs.txt
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"/zuul/layout.yaml
# Job for Zuul configuration validation
@@ -114,6 +123,7 @@
- 'integration-jjb-config-diff'
- 'integration-zuul-layoutdiff'
- 'integration-zuul-layoutvalidation'
+ - 'integration-zuul-layoutvalidation-gate'
- '{name}-tox-{toxenv}'
- '{name}-yamllint'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7ba4c29..e0e59e6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1832,7 +1832,7 @@
- integration-config-yamllint
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- - integration-zuul-layoutvalidation
+ - integration-zuul-layoutvalidation-gate
- name: integration/jenkins
template:
--
To view, visit https://gerrit.wikimedia.org/r/170320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8f8eecc5ded1a77b120df090db9100f142b99d9
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
