summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-14 19:55:43 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-14 19:55:43 +0200
commit16e325b94b9881854b72dfb0f54a5e23c750363f (patch)
treee9f1365df1d8676fe6a356cb5ce4d49e2a003e4f /jjb
parente5a2bbba465484526a78750719c366102867ed53 (diff)
Add maven parameters to docker snapshot job
- *another* follow-up and correction to https://gerrit.onap.org/r/c/ci-management/+/116262 Issue-ID: CCSDK-3019 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I0bb509a3b2bb1f230fde487d957f9f397b83851a
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ccsdk/distribution.yaml1
-rw-r--r--jjb/integration/integration-maven-jobs.yaml5
2 files changed, 4 insertions, 2 deletions
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index d503a3977..6f0c160f0 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -26,7 +26,6 @@
container-snapshot-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-versions-plugin: true
- maven-version: 'mvn36'
- '{project-name}-{stream}-docker-staging':
script:
!include-raw-escape: 'tag-ccsdk-distribution-images-staging.sh'
diff --git a/jjb/integration/integration-maven-jobs.yaml b/jjb/integration/integration-maven-jobs.yaml
index 885274b63..71cadeff8 100644
--- a/jjb/integration/integration-maven-jobs.yaml
+++ b/jjb/integration/integration-maven-jobs.yaml
@@ -120,7 +120,7 @@
mvn-goals: clean deploy
mvn-opts: ""
mvn-params: ""
- mvn-version: mvn35
+ maven-version: mvn36
ossrh-profile-id: ""
mvn-pom: ""
sign-artifacts: false
@@ -138,5 +138,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
+
- integration-unique-docker-tag:
unique-docker-tag: ''