Merge "Update archive items path for csit-hc2vpp jobs"

[ci-management.git] / jjb / hc2vpp / hc2vpp.yaml

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index c74ce08..7df7cc5 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -7,12 +7,9 @@
         - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
-            skip-site: 'false'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
-            skip-site: 'true'
+            skip-site: 'false'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
@@ -26,6 +23,9 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
 
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
@@ -63,9 +63,6 @@
             name: 'hc2vpp'
             branch: '{branch}'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -131,9 +128,6 @@
                 unstable: true
                 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
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -261,8 +255,6 @@
             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
         - shell:
             !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven: