Move Dmaven.test.skip param (v)

Rather than hardcoding this parameter as part of the
maven-docker-push-daily macro, we are passing it as a
"mvn-params" parameter from the project's JJB template.

Notice that this change IS NOT adding "Dmaven.test.skip=true"
but rather moving it away from the macro into the project's
template to handle it individually per project.

Please refer to commit 262e8694ebce04450bc29b4805088a354b8aaccb

Issue-ID: CIMAN-159
Change-Id: Ifb0d616f34730ffc0eaa9a371ad8800b7d153e50
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 06e1325..0591b95 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -6,7 +6,8 @@
       - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-release-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index aff445b..a9b0c7c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -24,6 +24,7 @@
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index c4a1254..c9ea5ff 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -48,6 +48,7 @@
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'docker/pom.xml'
           mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
 - project:
     name: vnfsdk-ice-validation-scripts-tox-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 30c3e07..0b07b10 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -14,6 +14,7 @@
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
           mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
 
     project: 'vnfsdk/refrepo'
     stream:

diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index 903df18..bc73a23 100644 (file)
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index 4516970..c1b4404 100644 (file)
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index c5b182b..3613edc 100644 (file)
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index 0fd2112..f29f877 100644 (file)
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index b78e0d2..77c8a72 100644 (file)
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm:
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index f037336..d62bd85 100644 (file)
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index af94edf..c3a0f31 100644 (file)
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project:

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 85287cd..b4ccbd8 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -16,7 +16,8 @@
     jobs:
       - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 - project: