X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fhc2vpp%2Fcsit-hc2vpp.yaml;h=606279c455d1e444adf28f291faaca5180e5e0df;hb=9666f87ebc17fc92836a486122d3d3bc86864bba;hp=2ce2c7966e350d721b418167c88bebc5e4182cc7;hpb=78ab1ab3514b8e13ffffced6e9f71f609042336e;p=ci-management.git

diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index 2ce2c7966..606279c45 100644
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -4,6 +4,8 @@
     jobs:
         - 'hc2vpp-csit-integration-{stream}-{os}'
         - 'hc2vpp-csit-verify-{stream}-{os}'
+        - 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
+        - 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
     project: 'hc2vpp'
     build-artifact-num-to-keep: 10
     stream:
@@ -13,16 +15,20 @@
         - '1701':
             branch: 'stable/1701'
             repo-stream-part: 'stable.1701'
+        - '1704':
+            branch: 'stable/1704'
+            repo-stream-part: 'stable.1704'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
-            skip-site: 'true'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+    odl:
+        - boron
 
 - job-template:
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: 'ubuntu1404-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -53,18 +59,10 @@
             jobs: 'hc2vpp-integration-{stream}-{os}'
             result: 'success'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
-
     builders:
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-integration.sh
 
-    postbuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi
-
     publishers:
         - archive-artifacts:
             artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
@@ -79,7 +77,7 @@
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: 'ubuntu1404-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
 
@@ -102,13 +100,14 @@
             maven-version: 'mvn33-new'
         - stream-parameter:
             stream: '{stream}'
+        - odl-parameter:
+            odl: '{odl}'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
-            branch: '{branch}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
         - fdio-infra-wrappers:
@@ -133,15 +132,13 @@
                 notbuilt: true
 
     prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} -DskipTests'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'hc2vpp-settings'
         settings-type: cfp
@@ -151,8 +148,6 @@
     postbuilders:
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-verify.sh
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi
 
     publishers:
         - archive-artifacts:
@@ -163,3 +158,148 @@
 
         - robot-report:
             output-path: 'csit'
+
+- job-template:
+    name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    concurrent: true
+
+    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}'
+        - os-parameter:
+            os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
+        - odl-parameter:
+            odl: '{odl}'
+
+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: 'hc2vpp-integration-{stream}-{os}'
+            result: 'success'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-hc2vpp-csit-integration-odl.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            latest-only: false
+        - email-notification:
+            email-prefix: '[hc2vpp]'
+
+        - robot-report:
+            output-path: 'csit'
+
+- job-template:
+    name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
+
+    project-type: maven
+    node: '{os}-basebuild-4c-4g'
+    jdk: openjdk8-{os}
+    concurrent: true
+
+    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}'
+        - os-parameter:
+            os: '{os}'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
+        - odl-parameter:
+            odl: '{odl}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-csit'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    prebuilders:
+        - shell:
+            !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
+
+    maven:
+        maven-name: 'mvn33-new'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
+        maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+        settings: 'hc2vpp-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
+
+    postbuilders:
+        - shell:
+            !include-raw-escape: include-raw-hc2vpp-csit-verify-odl.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            latest-only: false
+        - email-notification:
+            email-prefix: '[hc2vpp]'
+
+        - robot-report:
+            output-path: 'csit'
+
+- parameter:
+    name: odl-parameter
+    parameters:
+        - string:
+            name: ODL
+            default: '{odl}'
+            description: "ODL version parameter."
\ No newline at end of file