X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Fcsit-hc2vpp.yaml;h=0c838f422106973c1fc9c8e9c3a25e0ed3c6c514;hb=056928ef4743c00469e86bf0b572504358600853;hp=94e469948cb982f57cc19a64e3b9d5d96bbd6aba;hpb=936f5aeeff5bd25d8e5958a11a97135baaf294d5;p=ci-management.git

diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index 94e469948..0c838f422 100644
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -5,23 +5,23 @@
         - 'hc2vpp-csit-integration-{stream}-{os}'
         - 'hc2vpp-csit-verify-{stream}-{os}'
     project: 'hc2vpp'
-    branch: 'master'
-    branch-id: 'master'
     build-artifact-num-to-keep: 10
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1701'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
-            skip-site: 'true'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
 
 - job-template:
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -35,6 +35,8 @@
             project: '{project}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - git-scm:
@@ -47,21 +49,13 @@
 
     triggers:
         - reverse:
-            jobs: 'hc2vpp-verify-{stream}-{os}'
+            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'
@@ -76,7 +70,8 @@
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
+    jdk: openjdk8-{os}
     concurrent: true
 
     logrotate:
@@ -96,6 +91,8 @@
             maven: 'mvn33-new'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -127,15 +124,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
@@ -145,8 +140,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: