summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-14 18:00:21 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-14 18:00:21 +0200
commite5a2bbba465484526a78750719c366102867ed53 (patch)
treed4a0edf657031588f3e9f7e7ba4dc19ffb091ce4
parentab0ebdc5137ce4b336f159b446348af1fb9477e1 (diff)
Add maven executable to docker snapshot job
- 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: I6eca59766404350878dc30e8cf5ce837616512c6
-rw-r--r--jjb/ccsdk/distribution.yaml1
-rw-r--r--jjb/integration/integration-maven-jobs.yaml2
2 files changed, 3 insertions, 0 deletions
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 6f0c160f0..d503a3977 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -26,6 +26,7 @@
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 5c7a50391..885274b63 100644
--- a/jjb/integration/integration-maven-jobs.yaml
+++ b/jjb/integration/integration-maven-jobs.yaml
@@ -136,5 +136,7 @@
branch: '{branch}'
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
+ - maven-exec:
+ maven-version: '{maven-version}'
- integration-unique-docker-tag:
unique-docker-tag: ''