Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383134 )
Change subject: Factor out common maven jobs
......................................................................
Factor out common maven jobs
The search jobs 'search-{projects}' looks a lot like the '{name}-maven'
job now.
Add a job template alias based on name/project variables. So one can:
- project:
name: meta
project:
- foo
- bar
jobs:
- '{name}-{project}-maven'
Which would generate:
meta-foo-maven
meta-bar-maven
Apply that new pattern to all the search projects. Update the Zuul
triggers to reflect the new job names (now suffixed with '-maven').
Change-Id: Ic9d77cd65a11182e6a47bb778b35ab2ce1e3e436
---
M jjb/job-templates.yaml
M jjb/search.yaml
M zuul/layout.yaml
3 files changed, 18 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/34/383134/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 14d70e6..d06225d 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -32,7 +32,7 @@
builders:
- jsduck
-- job-template:
+- job-template: &job_template_maven
name: '{name}-maven'
project-type: maven
jdk: 'Debian - OpenJdk 8'
@@ -53,6 +53,14 @@
publishers:
- castor-save
+# Convenience alias with name/project variables
+- job-template:
+ !!merge: *job_template_maven
+ name: '{name}-{project}-maven'
+ # Reinject Zuul parameters since JJB strip for some reason
+ triggers:
+ - zuul
+
- job: &job_npm-node-6-jessie
name: 'npm-node-6-jessie'
node: ci-jessie-wikimedia
diff --git a/jjb/search.yaml b/jjb/search.yaml
index df65d6c..bb044f5 100644
--- a/jjb/search.yaml
+++ b/jjb/search.yaml
@@ -10,30 +10,8 @@
- ltr
- repository-swift
jobs:
- - 'search-{project}'
+ - '{name}-{project}-maven'
- 'search-{project}-javadoc-publish'
-
-- job-template:
- name: 'search-{project}'
- project-type: maven
- jdk: 'Debian - OpenJdk 8'
- node: ci-jessie-wikimedia
- concurrent: true
- triggers:
- - zuul
- properties:
- - build-discarder:
- days-to-keep: 15
- scm:
- - git-remoteonly-zuul
- prebuilders:
- - castor-load
- maven:
- goals: clean verify
- # https://integration.wikimedia.org/ci/configureTools/
- maven-name: 'Maven-3.5.0'
- publishers:
- - castor-save
- job-template:
name: 'search-{project}-javadoc-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4030b9b..2a8d594 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7425,33 +7425,33 @@
- name: search/extra
test:
- - search-extra
+ - search-extra-maven
gate-and-submit:
- - search-extra
+ - search-extra-maven
postmerge:
- search-extra-javadoc-publish
- name: search/highlighter
test:
- - search-highlighter
+ - search-highlighter-maven
gate-and-submit:
- - search-highlighter
+ - search-highlighter-maven
postmerge:
- search-highlighter-javadoc-publish
- name: search/ltr
test:
- - search-ltr
+ - search-ltr-maven
gate-and-submit:
- - search-ltr
+ - search-ltr-maven
postmerge:
- search-ltr-javadoc-publish
- name: search/repository-swift
test:
- - search-repository-swift
+ - search-repository-swift-maven
gate-and-submit:
- - search-repository-swift
+ - search-repository-swift-maven
postmerge:
- search-repository-swift-javadoc-publish
--
To view, visit https://gerrit.wikimedia.org/r/383134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d77cd65a11182e6a47bb778b35ab2ce1e3e436
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
