Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166014
Change subject: Adjust jobs for integration/config.git
......................................................................
Adjust jobs for integration/config.git
Phase out the legacy jjb and zuul config repositories.
Creates:
integration-config-yamllint
integration-config-tox-py27
I have reused some previous name, adjusting path/repo name where
relevant.
Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 27 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/14/166014/1
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 8d078f4..4951949 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -20,7 +20,7 @@
git checkout $ZUUL_COMMIT
echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
-# Pass zuul-config.git:zuul/layout.yaml to zuul-server layout validation
+# 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'
@@ -71,7 +71,7 @@
branches:
- master
- git:
- url: '$ZUUL_URL/integration/jenkins-job-builder-config'
+ url: '$ZUUL_URL/integration/config'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -105,28 +105,24 @@
echo "Done."
echo "Carefully review the diff above before deploying the jobs and
merging the patch"
+
+- project:
+ name: 'integration-config'
+ toxenv:
+ - py27
+ jobs:
+ - 'integration-jjb-config-diff'
+ - 'integration-zuul-layoutdiff'
+ - 'integration-zuul-layoutvalidation'
+ - '{name}-tox-{toxenv}'
+ - '{name}-yamllint'
+
- project:
name: 'integration-docroot'
jobs:
- 'integration-docroot-deploy'
- '{name}-phplint'
- '{name}-jslint'
-
-- project:
- name: 'integration-zuul-config'
- toxenv:
- - py27
- jobs:
- - 'integration-zuul-layoutdiff'
- - 'integration-zuul-layoutvalidation'
- - '{name}-yamllint'
- - '{name}-tox-{toxenv}'
-
-- project:
- name: 'integration-jjb-config'
- jobs:
- - '{name}-yamllint'
- - 'integration-jjb-config-diff'
- project:
name: 'integration-jenkins'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1f5291b..e252385 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1772,11 +1772,21 @@
- name: integration/config
check:
- - noop
+ - integration-config-yamllint
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
test:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
gate-and-submit:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
- name: integration/jenkins
template:
@@ -1794,15 +1804,6 @@
- 'integration-jenkins-phpunit'
- 'integration-jenkins-yamllint'
- - name: integration/jenkins-job-builder-config
- # FIXME: make this 'check' whenever we have integration tests
- check-voter:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
- gate-and-submit:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
-
- name: integration/phpunit
test:
- integration-phpunit-mediawiki-REL1_22
@@ -1815,22 +1816,6 @@
- integration-phpunit-mediawiki-REL1_24
- integration-phpunit-mediawiki-master
- mediawiki-gate
-
- - name: integration/zuul-config
- check:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- test:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
- gate-and-submit:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
- name: mediawiki/core
check:
--
To view, visit https://gerrit.wikimedia.org/r/166014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
