Convert integration to be regular jjb template

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

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
deleted file mode 100644 (file)
index d7eec71..0000000
--- a/jjb-templates/integration.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- job-template:
-    name: 'PROJECT_SHORTNAME-integration-{stream}'
-    disabled: DISABLED
-
-    # Job template for ODL integration verify jobs
-    #
-    # This is similar to a normal verify job, but it runs
-    # when a project that's a dependency of your project
-    # is successfully built.
-    #
-    # 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: '{project}'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: 'DEPENDENCIES'
-            result: 'success'
-
-    prebuilders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'JENKINS_SETTINGS'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'POM'
-        goals: 'MAVEN_GOALS -V -B -Djenkins'
-        maven-opts: 'MAVEN_OPTS'
-        settings: 'JENKINS_SETTINGS'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - email-notification:
-            email-prefix: 'EMAIL_PREFIX'
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index d9d58da425ddbe4f0ba91b767b8f9128f9885b12..011542c00ab886a15fbf2bd2d1589b013d4bdd84 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -9,6 +9,7 @@
         - '{name}-clm-{stream}'
         - '{name}-distribution-{stream}'
         - '{name}-distribution-check-{stream}'
+        - '{name}-integration-{stream}'
         - '{name}-validate-autorelease-{stream}'
 JOB_TEMPLATES
 
@@ -17,6 +18,10 @@ JOB_TEMPLATES
     STREAMS
     project: 'PROJECT_PATH'
     mvn-settings: 'JENKINS_SETTINGS'
+    mvn-goals: 'MAVEN_GOALS'
+    mvn-opts: 'MAVEN_OPTS'
+    dependencies: 'DEPENDENCIES'
+    email-upstream: 'EMAIL_PREFIX'
 
 # For the Job templates below replace instances of:
 # PROJECT_SHORTNAME with your project name (eg. circuitsw)

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 69a3e25f2ef2a1216415c41019b690eff732a8e3..101590d6c5b9be6fd9c73b75c8186129659434e4 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,integration
+JOB_TEMPLATES: verify,merge,periodic

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 9b6ff16c5b8eab3e9385c98a954ea03518a13c18..26a98b7fa13ec733ec37a9c7859c166b7960f4f0 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,integration
+JOB_TEMPLATES: verify,merge,periodic

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f489f306f2913dadc276ca09965934a28e83ab90..54f9c71a052f7ebc810228aa2320703048774dae 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -228,6 +228,72 @@
         - archive-build:
             maven-version: '{mvn33}'
 
+- job-template:
+    name: '{name}-integration-{stream}'
+
+    # Job template for ODL integration verify jobs
+    #
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
+    #
+    # 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: '{project}'
+
+    scm:
+        - git-scm:
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: '{dependencies}'
+            result: 'success'
+
+    prebuilders:
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: '{mvn-settings}'
+
+    maven:
+        maven-name: '{mvn33}'
+        goals: '{mvn-goals} -V -B -Djenkins'
+        maven-opts: '{mvn-opts}'
+        settings: '{mvn-settings}'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - email-notification:
+            email-prefix: '{email-upstream}'
+        - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
+
 - job-template:
     name: '{name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index 32b7a0f941dbbc41facee655d1a3908dcb4d685a..dd320b9af38e2261b99ae0bfcdffd412e9162525 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,integration,sonar
+JOB_TEMPLATES: merge,periodic,sonar

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 6391a253db39797450e46a2c9695a947ebe42b08..da8ff406c869925a8f829b3c5f7fab4b36b06a93 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,integration,"
+        "verify,merge,periodic,"
         "sonar")
 
 ##################