Convert distribution-check to regular jjb template

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

diff --git a/jjb-templates/distribution-check.yaml b/jjb-templates/distribution-check.yaml
deleted file mode 100644 (file)
index 6962b7d..0000000
--- a/jjb-templates/distribution-check.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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: 'PROJECT_SHORTNAME-distribution-check-{stream}'
-    disabled: '{obj:disable_distribution_check}'
-
-    project-type: maven
-    node: dynamic_verify
-    concurrent: true
-    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:
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-        - project-parameter:
-            project: '{project}'
-        - integration-distribution-git-url
-
-    scm:
-        - integration-gerrit-scm:
-            basedir: '$GERRIT_PROJECT'
-            refspec: '$GERRIT_REFSPEC'
-            branch: '{branch}'
-        - integration-distribution-scm:
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'test-distribution'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
-
-    prebuilders:
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
-            java-opts:
-                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: 'JENKINS_SETTINGS'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'distribution/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: 'JENKINS_SETTINGS'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        ignore-upstream-changes: true
-        post-step-run-condition: 'SUCCESS'
-
-    postbuilders:
-        - integration-distribution-check
-
-    publishers:
-        - email-notification:
-            email-prefix: '[PROJECT_SHORTNAME]'
-        - postbuildscript:
-            builders:
-                - shell: |
-                    #!/bin/bash
-                    mkdir -p $WORKSPACE/archives
-                    cp karaf*.log $WORKSPACE/archives
-            script-only-if-succeeded: False
-            script-only-if-failed: False
-            mark-unstable-if-failed: True
-        - archive-build:
-            maven-version: '{mvn33}'

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index f701764e42bc2bc3faa91fa87ff00d5d335cf269..b900890bcc423a77b7710bc8c0cd1b0e470700be 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-check-{stream}'
 JOB_TEMPLATES
 
     # stream:    release stream (eg. stable-lithium or beryllium)

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 8fdf3adc14cbb5080322aea3146b42ebc1b3c5bb..7d4ba7f27c699923f53e7383865feb4acae0a6de 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,distribution-check,integration
+JOB_TEMPLATES: verify,merge,periodic,distribution,integration

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 79ea600b5bc555fd4af6a6e609daea10606b3566..d3fd29c723b564fe7ea15219fc6e0fb411706227 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,distribution-check,integration
+JOB_TEMPLATES: verify,merge,periodic,distribution,integration

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f8cd06995485f1857699563fd4616df681842bb5..379d05cbfb8ecf723264d414031fda657079a26b 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -57,3 +57,113 @@
             email-prefix: '[{name}]'
         - 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-check-{stream}'
+    disabled: '{obj:disable_distribution_check}'
+
+    project-type: maven
+    node: dynamic_verify
+    concurrent: true
+    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:
+        - gerrit-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+        - project-parameter:
+            project: '{project}'
+        - integration-distribution-git-url
+
+    scm:
+        - integration-gerrit-scm:
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
+            branch: '{branch}'
+        - integration-distribution-scm:
+            branch: '{branch}'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-distribution'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{name}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
+
+    prebuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: '$GERRIT_PROJECT/pom.xml'
+            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'distribution/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: '{mvn-settings}'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+        ignore-upstream-changes: true
+        post-step-run-condition: 'SUCCESS'
+
+    postbuilders:
+        - integration-distribution-check
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{name}]'
+        - postbuildscript:
+            builders:
+                - shell: |
+                    #!/bin/bash
+                    mkdir -p $WORKSPACE/archives
+                    cp karaf*.log $WORKSPACE/archives
+            script-only-if-succeeded: False
+            script-only-if-failed: False
+            mark-unstable-if-failed: True
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index 6f58447633db7c7629f7804d96c7b446fa3a549f..d9bd5e1771b05854460e47f9866cfb146a1470d7 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,distribution-check,integration,sonar
+JOB_TEMPLATES: merge,periodic,distribution,integration,sonar

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index b33e7183b7dbab4bca9366b897cf9715f9e43859..556df8c8680dd16700c001ea2b9ad14961144326 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,distribution-check,integration,"
+        "verify,merge,periodic,distribution,integration,"
         "sonar")
 templates += ",validate-autorelease"  # Autorelease validate template