aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Migdal <marcin.migdal@nokia.com>2018-06-26 13:14:49 +0200
committerMarcin Migdal <marcin.migdal@nokia.com>2018-06-26 13:17:01 +0200
commitb529fa1824be51fac31f6d3d3bd1b82a21161f2e (patch)
tree7157dd54b85ccf1d219fc933bf310bc1ddde7303
parent81836d273402c46688d5dc90cccebb4562ac564b (diff)
Attempt to fix build.
Change-Id: Ib0b3e56e228e50b57456098a9a7cf38eec4156ba Issue-ID: INT-458 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
-rw-r--r--test/mocks/pnfsimulator/.gitlab-ci.yml9
-rw-r--r--test/mocks/pnfsimulator/pom.xml11
2 files changed, 5 insertions, 15 deletions
diff --git a/test/mocks/pnfsimulator/.gitlab-ci.yml b/test/mocks/pnfsimulator/.gitlab-ci.yml
deleted file mode 100644
index 4320a5725..000000000
--- a/test/mocks/pnfsimulator/.gitlab-ci.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-image: archive.docker-registry.eecloud.nsn-net.net/imp/matryoshka:latest
-
-stages:
- - build
-
-build:
- stage: build
- script:
- - mvn clean package
diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index c0e1ad825..0af1f6f6d 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -164,13 +164,12 @@
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
- <imageName>${project.artifactId}</imageName>
- <imageTags>${docker.image.tag}</imageTags>
+ <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.artifactId}</imageName>
+ <imageTags>latest</imageTags>
+ <imageTags>${project.version}-latest</imageTags>
<serverId>${onap.nexus.dockerregistry.daily}</serverId>
- <baseImage>openjdk:8-jre-alpine</baseImage>
- <cmd>
- java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}
- </cmd>
+ <baseImage>openjdk:8-jdk-alpine</baseImage>
+ <cmd>java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}</cmd>
<resources>
<resource>
<targetPath>${dependency.directory.name}</targetPath>