From 82b7f1a192b77164dab6f840a9285a1da1dd484d Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Wed, 10 Apr 2019 11:05:18 +0200
Subject: migration to new maven for honeycomb and hc2vpp jobs

 - switch to new version of maven due to build dependencies
   for new JDK11

Change-Id: I1510a87d60a0b64bcb62940585f8a9ef588e4bad
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 jjb/hc2vpp/hc2vpp-csit.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'jjb/hc2vpp/hc2vpp-csit.yaml')

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index 6406da484..c64a221a0 100644
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -101,7 +101,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
@@ -125,9 +125,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}'
       - odl-parameter:
@@ -169,7 +169,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
@@ -194,7 +194,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
@@ -248,7 +248,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
@@ -272,9 +272,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}'
       - odl-parameter:
@@ -316,7 +316,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
@@ -341,7 +341,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-perf-{stream}-{os}'
@@ -410,7 +410,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - parameter:
     name: odl-parameter
-- 
cgit 1.2.3-korg