summaryrefslogtreecommitdiffstats
path: root/jjb/hc2vpp
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/hc2vpp')
-rw-r--r--jjb/hc2vpp/hc2vpp-csit.yaml22
-rw-r--r--jjb/hc2vpp/hc2vpp.yaml26
2 files changed, 24 insertions, 24 deletions
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
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 321026564..1195e266f 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -77,7 +77,7 @@
branch: '{branch}'
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 -Dmerge site'
@@ -91,7 +91,7 @@
- email-notification:
email-prefix: '[hc2vpp]'
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'hc2vpp-verify-image-{stream}-{os}'
@@ -143,7 +143,7 @@
notbuilt: true
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 -Dmerge'
@@ -157,7 +157,7 @@
- email-notification:
email-prefix: '[hc2vpp]'
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'hc2vpp-merge-{stream}-{os}'
@@ -177,9 +177,9 @@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: 'mvn33-new'
+ maven: 'mvn36'
- maven-exec:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -202,7 +202,7 @@
branch: '{branch}'
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 -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
@@ -223,7 +223,7 @@
- email-notification:
email-prefix: '[hc2vpp]'
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'hc2vpp-integration-{stream}-{os}'
@@ -245,9 +245,9 @@
- stream-parameter:
stream: '{stream}'
- maven-project-parameter:
- maven: 'mvn33-new'
+ maven: 'mvn36'
- maven-exec:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
- string:
@@ -287,7 +287,7 @@
- shell:
!include-raw-escape: include-raw-hc2vpp-integration-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 -Dmerge'
@@ -299,7 +299,7 @@
postbuilders:
- maven-target:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
goals: '--version'
settings: 'hc2vpp-settings'
settings-type: cfp
@@ -327,4 +327,4 @@
deploy-unstable: false
release-env-var: SKIP_JAR_DEPLOY
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'