Merge "Activate JDK8 verification for neutron"

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index b292e9ea998ecf77956a40879a5a5723bd8ca57f..af2f5fd46e5f6d4f2808e6d04b6574b5287c37b8 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -4,6 +4,13 @@ yum clean all
 yum install -y -q unzip python-netaddr @development
 yum remove -y robotframework-{sshlibrary,requests}
 
+## install Latest Robot Framewrok from source
+cd /tmp
+wget https://pypi.python.org/packages/source/r/robotframework/robotframework-2.9a1.tar.gz > /dev/null 2>&1
+tar -xvf robotframework-2.9a1.tar.gz > /dev/null 2>&1
+cd robotframework-2.9a1
+python setup.py install > /dev/null 2>&1
+
 ## install Latest Robot SSHLibrary from source
 cd /tmp
 wget http://pypi.python.org/packages/source/r/robotframework-sshlibrary/robotframework-sshlibrary-2.1.1.tar.gz > /dev/null 2>&1

diff --git a/jjb/bgpcep/bgpcep-verify.yaml b/jjb/bgpcep/bgpcep-verify.yaml
new file mode 100644 (file)
index 0000000..0ae4d88
--- /dev/null
+++ b/jjb/bgpcep/bgpcep-verify.yaml
@@ -0,0 +1,157 @@
+- project:
+    name: bgpcep-verify
+    jobs:
+        - 'bgpcep-verify-{stream}'
+        - 'bgpcep-verify-stable-helium'
+
+
+    # stream:    branch with - in place of / (eg. stable-helium)
+    # branch:    branch (eg. stable/helium)
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    project: 'bgpcep'
+
+- job-template:
+    name: 'bgpcep-verify-{stream}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+                - openjdk8
+
+
+    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}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'bgpcep'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{bgpcep-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[bgpcep]'
+        - jacoco-report
+
+- job-template:
+    name: 'bgpcep-verify-stable-helium'
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+
+
+    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}'
+        - gerrit-parameter:
+            branch: 'stable/helium'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'bgpcep'
+            branch: 'stable/helium'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{bgpcep-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[bgpcep]'
+        - jacoco-report

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index 06c8e1812c78fef0bbcc94e5f33c0804d52310c6..d9bb08ca6fd7bffc29f2d2132043041aead07da2 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -1,5 +1,5 @@
-BRANCHES: master,stable/helium
+JOB_TEMPLATES: merge,daily,integration,sonar
+BRANCHES: master,stable/helium,stable/lithium
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller,tcpmd5
-JDKS: openjdk7,openjdk8

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 291e8d59919c261e2eb3851097c11e57b57ac9f4..912a865554de4a247be370b036be9c14e60f4a58 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -6,7 +6,6 @@
 - project:
     name: bgpcep
     jobs:
-        - 'bgpcep-verify-{stream}'
         - 'bgpcep-merge-{stream}'
         - 'bgpcep-daily-{stream}'
         - 'bgpcep-integration-{stream}'
@@ -30,81 +29,6 @@
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build
 
-- job-template:
-    name: 'bgpcep-verify-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values:
-                - openjdk7
-                - openjdk8
-
-
-    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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: '{branch}'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{bgpcep-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[bgpcep]'
-        - jacoco-report
-
 - job-template:
     name: 'bgpcep-merge-{stream}'
 

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index c75a4cb54a8081843f07d7a571dadd1990a5cb13..c6f6758c44246552c8ece37269b1d2914ef2f4d4 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -1,3 +1,4 @@
+BRANCHES: master,stable/helium,stable/lithium
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 1cd6159fa23718f8fb84f3dcdfa565798b44278a..2812627f95cedbaaf240213af71e9e1a3a14a42f 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -21,6 +21,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'l2switch'
     jdk: 'openjdk7'

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index f6a2c9ca42aabf9a087b3bcf7854dbfa73c686a4..6de0c932c51102dacce225a7b1a380cafcfc054c 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -1,2 +1,3 @@
+BRANCHES: master,stable/helium,stable/lithium
 DEPENDENCIES: yangtools,controller
 JDKS: openjdk7,openjdk8

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 414ec326fe8f447e15f9c0c8ff6cc827c9a0dd75..c643012968a3fe9d30217c63142b54ff5d113d74 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -21,6 +21,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'openflowjava'
     jdk: 'openjdk7'

diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg
index f2de91d9eabac063fffdecf92477f5b724bc4f5a..72c89ba81722d4e65bbdc257a94036b596fa5bc8 100644 (file)
--- a/jjb/persistence/persistence.cfg
+++ b/jjb/persistence/persistence.cfg
@@ -1 +1,2 @@
-BRANCHES: master
+BRANCHES: master,stable/lithium
+JDKS: openjdk7,openjdk8

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 3fefe13d0bc9e2646863e591427228fcf530a3d7..090f3bdf8fd6b372de76f8e84185a5b588d9886b 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -19,6 +19,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'persistence'
     jdk: 'openjdk7'
@@ -53,6 +55,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate:

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index f2de91d9eabac063fffdecf92477f5b724bc4f5a..daff9db14486b05fa75be6049c5e710fb073450d 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -1 +1 @@
-BRANCHES: master
+BRANCHES: master,stable/lithium

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 3ea7c834504ab01d7b32f82d3802bade920fc9fc..b7eb3b0cd010c8dda0c89f360dcb0fd994009a5b 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -19,6 +19,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'snmp'
     jdk: 'openjdk7'

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index 95cfec008f06717bcf9e65f8d582d90c71437a08..83c4ec70edc98047756db84641c6d370e57f3d93 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -1,2 +1,2 @@
-BRANCHES: master
-DEPENDENCIES: controller,yangtools
\ No newline at end of file
+BRANCHES: master,stable/lithium
+DEPENDENCIES: controller,yangtools

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 14d00c485f3b47a886537c95dec6efdcfb930e46..abdc83a65a443835537b11a8468762658feddc03 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -19,6 +19,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'topoprocessing'
     jdk: 'openjdk7'