Convert distribution jobs to be regular jjb templates

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

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
deleted file mode 100644 (file)
index dfd1c5d..0000000
--- a/jjb-templates/distribution.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job-template:
-    name: 'PROJECT_SHORTNAME-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: maven
-    node: dynamic_merge
-    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: 'integration/distribution'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'JENKINS_SETTINGS'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: 'integration-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - archive-build:
-            maven-version: '{mvn33}'

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index b900890bcc423a77b7710bc8c0cd1b0e470700be..392814590b46098725ebffa2485b965b5c69abba 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -7,6 +7,7 @@
     name: PROJECT_SHORTNAME
     jobs:
         - '{name}-clm-{stream}'
+        - '{name}-distribution-{stream}'
         - '{name}-distribution-check-{stream}'
 JOB_TEMPLATES
 

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 7d4ba7f27c699923f53e7383865feb4acae0a6de..69a3e25f2ef2a1216415c41019b690eff732a8e3 100644 (file)
--- a/jjb/netvirt/netvirt.cfg
+++ b/jjb/netvirt/netvirt.cfg
@@ -8,4 +8,4 @@ STREAMS:
     jdks: openjdk7,openjdk8
     autorelease: true
 DEPENDENCIES: controller,neutron,odlparent,openflowjava,openflowplugin,ovsdb,sfc,yangtools
-JOB_TEMPLATES: verify,merge,periodic,distribution,integration
+JOB_TEMPLATES: verify,merge,periodic,integration

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index d3fd29c723b564fe7ea15219fc6e0fb411706227..9b6ff16c5b8eab3e9385c98a954ea03518a13c18 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -12,4 +12,4 @@ STREAMS:
     jdks: openjdk7
     distribution-check: false
 DEPENDENCIES: odlparent,controller,yangtools
-JOB_TEMPLATES: verify,merge,periodic,distribution,integration
+JOB_TEMPLATES: verify,merge,periodic,integration

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 379d05cbfb8ecf723264d414031fda657079a26b..6f9eed499022d96e2dd93ec6e4e060128d6db7b4 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -58,12 +58,72 @@
         - archive-build:
             maven-version: '{mvn33}'
 
-# Template: integration-patch-distribution-{stream}
-# Goal: Build a patch and make sure the distribution can deploy with this change
-# Operation: This job template builds a patch, creates a distribution containing
-#            the patch, and triggers the distribution deploy test
+- job-template:
+    name: '{name}-distribution-{stream}'
+
+    # Required variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    project-type: maven
+    node: dynamic_merge
+    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: 'integration/distribution'
+
+    scm:
+        - git-scm:
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: '{mvn-settings}'
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: 'integration-distribution-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
+    # Template: integration-patch-distribution-{stream}
+    # Goal: Build a patch and make sure the distribution can deploy with this change
+    # Operation: This job template builds a patch, creates a distribution containing
+    #            the patch, and triggers the distribution deploy test
+
     name: '{name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
 

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index d9bd5e1771b05854460e47f9866cfb146a1470d7..32b7a0f941dbbc41facee655d1a3908dcb4d685a 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -12,4 +12,4 @@ STREAMS:
     jdks: openjdk7,openjdk8
     distribution-check: false
 DEPENDENCIES: odlparent
-JOB_TEMPLATES: merge,periodic,distribution,integration,sonar
+JOB_TEMPLATES: merge,periodic,integration,sonar

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 556df8c8680dd16700c001ea2b9ad14961144326..7f6f8d2e93f302d8846d6f9b8df02c8256f2a781 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -58,7 +58,7 @@ if cfg.get("JOB_TEMPLATES"):
     templates = cfg.get("JOB_TEMPLATES")
 else:
     templates = (
-        "verify,merge,periodic,distribution,integration,"
+        "verify,merge,periodic,integration,"
         "sonar")
 templates += ",validate-autorelease"  # Autorelease validate template