Convert autorelease builders to common template

Change-Id: Iacab69ef89ee8fab5f8f5e71507e47fb33263d8e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-beryllium.yaml b/jjb/autorelease/autorelease-beryllium.yaml
deleted file mode 100644 (file)
index d4bf21d..0000000
--- a/jjb/autorelease/autorelease-beryllium.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Beryllium build jobs
-
-- project:
-    name: autorelease-beryllium
-    jobs:
-        - 'autorelease-daily-beryllium'
-
-    branch: 'master'
-    project: 'releng/autorelease'
-    jdk: 'openjdk7'
-
-- job-template:
-    name: 'autorelease-daily-beryllium'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Daily'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H 0 * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index 1f993098413b77363056550aa6e6df5ee7c3dd43..c8b12b50b8f2b90087a18ff6432b9706529977d6 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -3,88 +3,12 @@
 - project:
     name: autorelease-lithium
     jobs:
-        - 'autorelease-daily-lithium'
         - 'autorelease-daily-lithium-jdk8'
-        - 'autorelease-release-lithium'
 
     branch: 'stable/lithium'
     project: 'releng/autorelease'
     jdk: 'openjdk7'
 
-- job-template:
-    name: 'autorelease-daily-lithium'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Daily'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H 0 * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'
-
 - job-template:
     name: 'autorelease-daily-lithium-jdk8'
 
@@ -158,78 +82,3 @@
             artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
-
-- job-template:
-    name: 'autorelease-release-lithium'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Pre-Lithium'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: false
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: true
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
-        - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
new file mode 100644 (file)
index 0000000..2e2086d
--- /dev/null
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -0,0 +1,15 @@
+- project:
+    name: autorelease-projects
+    jobs:
+        - 'autorelease-daily-{stream}'
+        - 'autorelease-release-{stream}'
+
+    stream:
+    - beryllium:
+        branch: 'master'
+        jdk: 'openjdk7'
+    - lithium:
+        branch: 'stable/lithium'
+        jdk: 'openjdk7'
+
+    project: 'releng/autorelease'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
new file mode 100644 (file)
index 0000000..3a2d3ce
--- /dev/null
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -0,0 +1,151 @@
+# Autorelease build jobs
+
+- job-template:
+    name: 'autorelease-daily-{stream}'
+
+    project-type: maven
+    node: dynamic_autorelease
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - autorelease-release-tag:
+            release-tag: 'Daily'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
+        - autorelease-release-datestamp:
+            datestamp: true
+
+    scm:
+        - git:
+            credentials-id: '{ssh-credentials}'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            submodule:
+                recursive: true
+
+    wrappers:
+        - autorelease-build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H 0 * * *'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - autorelease-generate-taglist
+        - autorelease-generate-release-patches
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+        automatic-archiving: false
+        post-step-run-condition: UNSTABLE
+
+    postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-maven-sources:
+            maven-version: '{mvn33}'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
+        - autorelease-sys-stats
+
+    publishers:
+        - archive-artifacts:
+            artifacts: '*.log,patches/*.patch'
+        - email-notification:
+            email-prefix: '[autorelease]'
+
+
+- job-template:
+    name: 'autorelease-release-{stream}'
+
+    project-type: maven
+    node: dynamic_autorelease
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - autorelease-release-tag:
+            release-tag: 'Test-{stream}'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
+        - autorelease-release-datestamp:
+            datestamp: false
+
+    scm:
+        - git:
+            credentials-id: '{ssh-credentials}'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            submodule:
+                recursive: true
+
+    wrappers:
+        - autorelease-build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - autorelease-generate-taglist
+        - autorelease-generate-release-patches
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+        automatic-archiving: true
+        post-step-run-condition: UNSTABLE
+
+    postbuilders:
+        - autorelease-cfp:
+            autorelease-settings: '{autorelease-settings}'
+            odl-global-settings: '{odl-global-settings}'
+        - autorelease-maven-deploy
+        - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-maven-sources:
+            maven-version: '{mvn33}'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
+        - autorelease-sys-stats
+
+    publishers:
+        - archive-artifacts:
+            artifacts: '*.log,patches/*.patch'
+        - email-notification:
+            email-prefix: '[autorelease]'