Mariadb docker used for ittests

Clamp has a bunch it tests which needs a mariadb docker container.
Recent changes on availability of the DOCKER_REGISTRY env variable
force the registry to 'nexus3.onap.org' instead of docker.io.
This patch corrects both behaviors by setting 'nexus3.onap.org:10001 instead'

Issue-ID: CLAMP-150
Change-Id: I30a980c89755df05b8ec5f4aa0258031f4270bde
Signed-off-by: ac2550 <ac2550@intl.att.com>

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 3841b88..a79ad44 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -5,7 +5,8 @@
     project-name: 'clamp'
     jobs:
       - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java-checkstyle'
+      - '{project-name}-{stream}-verify-java-checkstyle':
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
@@ -37,7 +38,8 @@
 - project:
     name: clamp-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
     cron: 'H 11 * * *'
     build-node: ubuntu1604-docker-8c-8g
     project: 'clamp'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 2c4e1fe..a984574 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -155,6 +155,8 @@
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
@@ -176,7 +178,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           goals: 'clean install -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'