jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344920 )
Change subject: Rm integration-zuul-layoutvalidation
......................................................................
Rm integration-zuul-layoutvalidation
The layout is already loaded by the test suite. The job is thus
redundant and useless.
Change-Id: Ibdc7eba6268de17b0b2a9303a052c3b4da9c9ae3
---
M jjb/integration.yaml
M tests/fixtures/zuul-dummy.conf
M zuul/layout.yaml
3 files changed, 1 insertion(+), 17 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 4d56b55..3c64055 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -20,20 +20,6 @@
git checkout $ZUUL_COMMIT
echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
-# Pass integration/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'
- # Same distro as the prod machine hosting Zuul server
- node: contintLabsSlave && DebianJessie
- defaults: use-remoteonly-zuul
- concurrent: true
- triggers:
- - zuul
- builders:
- - shell: |
- /usr/bin/zuul-server -c tests/fixtures/zuul-dummy.conf -l
"$WORKSPACE"/zuul/layout.yaml
-
- job-template:
name: 'integration-zuul-layoutvalidation-gate'
# Same distro as the prod machine hosting Zuul server
@@ -189,7 +175,6 @@
jobs:
- 'integration-jjb-config-diff'
- 'integration-zuul-layoutdiff'
- - 'integration-zuul-layoutvalidation'
- 'integration-zuul-layoutvalidation-gate'
- '{name}-rake-jessie'
- '{name}-tox-jessie'
diff --git a/tests/fixtures/zuul-dummy.conf b/tests/fixtures/zuul-dummy.conf
index 55db0b5..7ebcdfb 100644
--- a/tests/fixtures/zuul-dummy.conf
+++ b/tests/fixtures/zuul-dummy.conf
@@ -1,4 +1,4 @@
-# Used by Jenkins job integration-zuul-layoutvalidation
+# Used by Jenkins job integration-zuul-layoutvalidation-gate
[zuul]
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da55ce5..4dff8a6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1176,7 +1176,6 @@
- integration-config-tox-dib-jessie
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- - integration-zuul-layoutvalidation
gate-and-submit:
- integration-config-rake-jessie
- integration-config-tox-jessie
--
To view, visit https://gerrit.wikimedia.org/r/344920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdc7eba6268de17b0b2a9303a052c3b4da9c9ae3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
