Add tests to SDC merge job

Do not skip tests for sdc-merge-java job

Change-Id: Ic3e3022f0a4d8b9c7863d9fd184da9aa363d323e
Issue-ID: SDC-1142
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 85c2756..cf34094 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -61,6 +61,21 @@
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
 
+- builder:
+    name: maven-docker-push-daily-test
+    builders:
+      - maven-target:
+          maven-version: '{maven-version}'
+          pom: '{pom}'
+          goals: 'clean deploy -B -P {mvn-profile}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+          properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+
 - builder:
     name: docker-login
     builders:

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c34e945..0ec331f 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -2117,7 +2117,7 @@
 
       - docker-login
 
-      - maven-docker-push-daily:
+      - maven-docker-push-daily-test:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'