summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-19 09:27:18 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-19 09:27:18 -0700
commit9a03dac290e0b418e522aa9b2f9451006b34c4f0 (patch)
treebfa44341e36fad276b69a7234f8845b34791bccc
parentd5e92b98939a6176bce1bdf48c955254e9abeaf5 (diff)
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>
-rw-r--r--jjb/global-macros.yaml15
-rw-r--r--jjb/global-templates-java.yaml2
2 files changed, 16 insertions, 1 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 85c275644..cf3409434 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -62,6 +62,21 @@
- 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:
- shell: !include-raw: include-docker-login.sh
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c34e94566..0ec331f7c 100644
--- 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}'