diff options
| author |   ac2550 <ac2550@intl.att.com> | 2018-04-04 13:39:53 +0200 |
|---|---|---|
| committer | ac2550 <ac2550@intl.att.com> | 2018-04-04 15:36:30 +0200 |
| commit | ef92ed90a440fc1b8a89053d54053186c855dbcf (patch) | |
| tree | 098cd565402a21a34890f698d0191af51a091791 /jjb | |
| parent | e5b814d61ffb827b024e5c5e0376f90f08d10e81 (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/clamp/clamp.yaml | 6 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 3841b8880..a79ad4452 100644 --- 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 2c4e1fe9c..a98457482 100644 --- 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' |