Merge "CSIT-1193 Update of perf jobs"

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

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 0b8f67c..adc9fab 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -7,24 +7,32 @@
         - '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'
+        - '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}'
     project-type: maven
-    node: verify-{os}
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -57,11 +65,8 @@
             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'
+        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  -Dmerge site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -73,11 +78,13 @@
     publishers:
         - email-notification:
             email-prefix: '[hc2vpp]'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'hc2vpp-verify-image-{stream}-{os}'
     project-type: maven
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -123,11 +130,8 @@
                 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'
+        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  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -139,11 +143,13 @@
     publishers:
         - email-notification:
             email-prefix: '[hc2vpp]'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
     project-type: maven
-    node: merge-{os}
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     logrotate:
@@ -158,7 +164,9 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -181,7 +189,7 @@
             branch: '{branch}'
 
     maven:
-        maven-name: 'mvn33'
+        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  -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -200,11 +208,13 @@
             branch: '{stream}'
         - email-notification:
             email-prefix: '[hc2vpp]'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
     project-type: maven
-    node: merge-{os}
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     logrotate:
@@ -218,10 +228,18 @@
             project: '{project}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            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:
@@ -242,11 +260,10 @@
             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:
-        maven-name: 'mvn33'
+        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  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -257,7 +274,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'hc2vpp-settings'
             settings-type: cfp
@@ -270,6 +287,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
 
@@ -280,3 +300,6 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+            release-env-var: SKIP_JAR_DEPLOY
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'