Build analytics and analytics-etl master on GitHub
Change-Id: I303285865c9d1658f4618e38e364f8ced6476425
diff --git a/jenkins/gerrit-app-analytics-etl.yaml b/jenkins/gerrit-app-analytics-etl.yaml
index 3bbeb84..22235da 100644
--- a/jenkins/gerrit-app-analytics-etl.yaml
+++ b/jenkins/gerrit-app-analytics-etl.yaml
@@ -1,6 +1,7 @@
- job-template:
- name: 'app-{name}-sbt-{branch}'
- description: 'App {name} {branch} branch build with Sbt'
+ name: 'app-{name}-gh-sbt-{branch}'
+ description: >
+ App {name} {branch} branch build with Sbt owned by {organization} and hosted on GitHub'
node: sbt
targets: compile test assembly
wrappers:
@@ -26,8 +27,7 @@
- git:
remotes:
- origin:
- url: https://gerrit.googlesource.com/a/apps/{name}
- credentials-id: gerrit.googlesource.com
+ url: https://github.com/{organization}/{repo}
branches:
- origin/{branch}
submodule:
@@ -47,7 +47,9 @@
- project:
name: analytics-etl
+ repo: analytics-etl
+ organization: GerritForge
jobs:
- - 'app-{name}-sbt-{branch}':
+ - 'app-{name}-gh-sbt-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml b/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
index c5a15d9..60fdb21 100644
--- a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
@@ -1,6 +1,6 @@
- project:
name: analytics-wizard
jobs:
- - 'plugin-{name}-sbt-{branch}':
+ - 'plugin-{name}-gh-sbt-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-sbt-plugin-analytics.yaml b/jenkins/gerrit-sbt-plugin-analytics.yaml
index 81683c8..be55737 100644
--- a/jenkins/gerrit-sbt-plugin-analytics.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics.yaml
@@ -1,7 +1,11 @@
- project:
name: analytics
+ repo: analytics
+ organization: GerritForge
jobs:
- 'plugin-{name}-sbt-{branch}':
branch:
- - master
- stable-3.10
+ - 'plugin-{name}-gh-sbt-{branch}':
+ branch:
+ - master
diff --git a/jenkins/gerrit-sbt-plugin-template.yaml b/jenkins/gerrit-sbt-plugin-template.yaml
index 3bb094e..f27f37b 100644
--- a/jenkins/gerrit-sbt-plugin-template.yaml
+++ b/jenkins/gerrit-sbt-plugin-template.yaml
@@ -50,7 +50,8 @@
- job-template:
name: 'plugin-{name}-sbt-{branch}-{gerrit-branch}'
- description: 'Plugin {name} {branch} branch build with Sbt on top of Gerrit {gerrit-branch}'
+ description: >
+ Plugin {name} {branch} branch build with Sbt on top of Gerrit {gerrit-branch}
defaults: sbt-build-defaults
builders:
- set-git-credentials
@@ -58,6 +59,31 @@
!include-raw: gerrit-sbt-build-branch-plugin.sh
- job-template:
+ name: 'plugin-{name}-gh-sbt-{branch}-{gerrit-branch}'
+ description: >
+ Plugin {name} {branch} SBT build on {gerrit-branch} by {organization} on GitHub
+ defaults: sbt-build-defaults
+ scm:
+ - git:
+ remotes:
+ - origin:
+ url: https://github.com/{organization}/{repo}
+ - gerrit:
+ url: https://gerrit.googlesource.com/a/gerrit
+ credentials-id: gerrit.googlesource.com
+ branches:
+ - origin/{branch}
+ submodule:
+ recursive: true
+ parent-credentials: true
+ skip-tag: true
+ do-not-fetch-tags: true
+ builders:
+ - set-git-credentials
+ - shell:
+ !include-raw: gerrit-sbt-build-branch-plugin.sh
+
+- job-template:
name: 'plugin-{name}-sbt-{branch}'
description: 'Plugin {name} build with Sbt on top of Gerrit {branch}'
defaults: sbt-build-defaults
@@ -65,3 +91,28 @@
- set-git-credentials
- shell:
!include-raw: gerrit-sbt-build-plugin.sh
+
+- job-template:
+ name: 'plugin-{name}-gh-sbt-{branch}'
+ description: >
+ Plugin {name} SBT build on {branch} by {organization} on GitHub
+ defaults: sbt-build-defaults
+ scm:
+ - git:
+ remotes:
+ - origin:
+ url: https://github.com/{organization}/{repo}
+ - gerrit:
+ url: https://gerrit.googlesource.com/a/gerrit
+ credentials-id: gerrit.googlesource.com
+ branches:
+ - origin/{branch}
+ submodule:
+ recursive: true
+ parent-credentials: true
+ skip-tag: true
+ do-not-fetch-tags: true
+ builders:
+ - set-git-credentials
+ - shell:
+ !include-raw: gerrit-sbt-build-plugin.sh
