aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--pom.xml9
2 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54bbacf2..9c22c64a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,5 +22,5 @@ publish:
- master
script:
- docker login $DOCKER_REPO_ADDR -u $DOCKER_REPO_USER -p $DOCKER_REPO_PASS
- - mvn -e -DskipTests -DskipAnalysis -Ddocker.registry="$DOCKER_REPO_ADDR" deploy
+ - mvn -e -DskipTests -DskipAnalysis -Ddocker-image.registry="$DOCKER_REPO_ADDR" deploy
- "curl -X POST -F token=$INTEGRATION_TESTS_TRIGGER_TOKEN -F ref=master https://gitlabe1.ext.net.nokia.com/api/v4/projects/33403/trigger/pipeline"
diff --git a/pom.xml b/pom.xml
index adc53a70..026afec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,10 +70,13 @@
<failIfMissingComponentTests>false</failIfMissingComponentTests>
<skipAnalysis>true</skipAnalysis>
- <!-- Docker -->
<skipDocker>true</skipDocker> <!-- TODO: unskip docker -->
- <docker-image.name>ves-hv-collector/${project.artifactId}</docker-image.name>
+ <!-- Docker -->
+ <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
+ <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
+ <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
<docker-image.namespace>onap</docker-image.namespace>
+ <docker-image.name>ves-hv-collector/${project.artifactId}</docker-image.name>
</properties>
@@ -400,7 +403,7 @@
<images>
<image>
<alias>${project.artifactId}</alias>
- <name>${docker-image.namespace}/${docker-image.name}</name>
+ <name>${docker-image.registry}/${docker-image.namespace}/${docker-image.name}</name>
<build>
<dockerFileDir>${project.basedir}</dockerFileDir>
</build>