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

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index d503a39..6f0c160 100644 (file)
--- 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 885274b..71cadef 100644 (file)
--- 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: ''