From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Mon, 14 Dec 2020 16:00:21 +0000 (+0200)
Subject: Add maven executable to docker snapshot job
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F116346%2F1;p=ci-management.git

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
---

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: ''