X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fjvpp%2Fjvpp.yaml;h=cd6e1a4c0fe1dd9e0baffbf717a226254c3d45a9;hb=78ffb3b6514eafe2cdd30e457bb390b2c5a8e59b;hp=a526bd1aa0976ea6f8247c6ed561b0466993897d;hpb=afa8332ca87a5ee1728ff0f438224ee466406a6d;p=ci-management.git

diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml
index a526bd1aa..cd6e1a4c0 100644
--- a/jjb/jvpp/jvpp.yaml
+++ b/jjb/jvpp/jvpp.yaml
@@ -9,15 +9,18 @@
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
           skip-site: 'false'
-          skip-jar-deploy: 'false'
+          skip-jar-deploy: 'true'
+          vpp-job-prefix: ''
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
           skip-site: 'false'
           skip-jar-deploy: 'false'
+          vpp-job-prefix: 'beta-'
       - centos7:
           repo-os-part: 'centos7'
           skip-site: 'true'
           skip-jar-deploy: 'true'
+          vpp-job-prefix: ''
     stream:
       - master:
           branch: 'master'
@@ -70,6 +73,8 @@
           branch: '{branch}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: openjdk11
       - shell:
           !include-raw-escape:
           - ../scripts/setup_jvpp_dev_env.sh
@@ -86,7 +91,7 @@
           only-if-success: true
           default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/jvpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
@@ -115,9 +120,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - stream-parameter:
           stream: '{stream}'
       - repo-name-parameter:
@@ -138,10 +143,12 @@
           name: '{project}'
           branch: '{branch}'
       - reverse:
-          jobs: 'vpp-merge-{stream}-{os}'
+          jobs: 'vpp-{vpp-job-prefix}merge-{stream}-{os}'
           result: 'success'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: openjdk11
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -151,9 +158,9 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
-          settings: 'vpp-settings'
+          settings: 'jvpp-settings'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
@@ -182,7 +189,7 @@
           only-if-success: true
           default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1