jenkins-bot has submitted this change and it was merged.
Change subject: Normalize analytics maven jobs
......................................................................
Normalize analytics maven jobs
analytics-kraken --> analytics-kraken-maven
maven --> analytics-refinery-maven
Job have been renamed manually in Jenkins.
Change-Id: I98e4f1ee4c18f3a8b431838e3938e1512b145f4d
---
M jjb/analytics.yaml
M jjb/job-templates.yaml
M zuul/layout.yaml
3 files changed, 12 insertions(+), 25 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml
index b872de5..c454f3d 100644
--- a/jjb/analytics.yaml
+++ b/jjb/analytics.yaml
@@ -1,22 +1,9 @@
-# Jobs for git repositories under analytics/*
-- job-template:
- name: 'analytics-kraken'
- project-type: maven
- node: contintLabsSlave && UbuntuTrusty
- triggers:
- - zuul
- scm:
- - git-remoteonly-zuul
- wrappers:
- - timeout:
- timeout: 30 # minutes
- fail: true
- - timestamps
- - ansicolor
- maven:
- goals: clean package
-
- project:
name: 'analytics-kraken'
jobs:
- - 'analytics-kraken'
+ - '{name}-maven'
+
+- project:
+ name: 'analytics-refinery'
+ jobs:
+ - '{name}-maven'
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 8a188b9..f3290f6 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -69,8 +69,8 @@
builders:
- jsduck
-- job:
- name: 'maven'
+- job-template:
+ name: '{name}-maven'
project-type: maven
jdk: 'Ubuntu - OpenJdk 7'
node: contintLabsSlave && UbuntuTrusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2aacb08..caf7044 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -614,7 +614,7 @@
branch: (?:^REL1_25$)
# Experiment for analytics/kraken repository
- - name: analytics-kraken
+ - name: analytics-kraken-maven
voting: false
# Experimental building of Debian packages
@@ -1368,7 +1368,7 @@
- name: analytics/kraken
test:
- - analytics-kraken
+ - analytics-kraken-maven
- name: analytics/libanon
test:
@@ -1400,9 +1400,9 @@
- name: analytics/refinery/source
test:
- - maven
+ - analytics-refinery-maven
gate-and-submit:
- - maven
+ - analytics-refinery-maven
- name: analytics/udp-filters
test:
--
To view, visit https://gerrit.wikimedia.org/r/288611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98e4f1ee4c18f3a8b431838e3938e1512b145f4d
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
