X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Fhc2vpp.yaml;h=34686bb2e0ea86b421af6926f5ad4a3260cdcc52;hb=c89e4a148d0b1a8c476d208d07e93154d52b327c;hp=504459c713dee2993b27c49dc49ca6d8dec2a2fa;hpb=93c55f0b864293bee5f5e3aa77fac82bb05ce0a2;p=ci-management.git

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 504459c71..34686bb2e 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -7,22 +7,27 @@
         - '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'
+            skip-jar-deploy: 'false'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
+            skip-jar-deploy: 'true'
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1701':
-            branch: 'stable/1701'
-            repo-stream-part: 'stable.1701'
+        - '1801':
+            branch: 'stable/1801'
+            repo-stream-part: 'stable.1801'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
 
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
@@ -60,9 +65,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'
@@ -128,9 +130,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'
@@ -211,10 +210,6 @@
             email-prefix: '[hc2vpp]'
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
 
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
@@ -233,13 +228,18 @@
             project: '{project}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
         - maven-project-parameter:
             maven: 'mvn33-new'
         - maven-exec:
             maven-version: 'mvn33-new'
-
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - string:
+            name: SKIP_JAR_DEPLOY
+            default: '{skip-jar-deploy}'
+            description: "Skips deployment of hc2vpp jars if variable is set to true"
 
     scm:
         - git-scm:
@@ -259,10 +259,19 @@
             jobs: 'vpp-merge-{stream}-{os},hc2vpp-merge-{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:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins/.packagecloud'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins/packagecloud_api'
 
+    prebuilders:
+        - shell:
+            !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -288,6 +297,9 @@
             !include-raw-escape:
                 - ../scripts/maven_push_functions.sh
                 - include-raw-hc2vpp-pkg-push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
     reporters:
         - findbugs
 
@@ -298,9 +310,6 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+            release-env-var: SKIP_JAR_DEPLOY
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false