diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-08 15:20:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-08 15:20:47 +0000 |
| commit | 6aba10720c1e9a3dbadd72b4a233b3a5ee45529d (patch) | |
| tree | 0dad529d3e26b7dbcb8561815c8a69b1a07e7b68 | |
| parent | 7cf2518fd6fdc4bef50e4cf9771f637cf6c64de6 (diff) | |
| parent | 6720a7f1e6a0d35ffca1b7c683e06b77abd1331b (diff) | |
Merge "Preparing for INT-607 Attempt to fix build"
| -rw-r--r-- | test/mocks/pnfsimulator/pom.xml | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 442d3fcaa..03dc374ad 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -125,12 +125,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <version>${junit.vintage.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <version>3.9.1</version> @@ -273,41 +267,69 @@ </goals> </execution> <execution> - <id>tag-and-push-image-latest</id> - <phase>deploy</phase> + <id>tag-image-latest</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> + <!-- WA in case push does not wort at seconf job - to remove <pushImage>true</pushImage> + --> </configuration> </execution> <execution> - <id>tag-and-push-image-with-version</id> - <phase>deploy</phase> + <id>push-image-latest</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName> + </configuration> + </execution> + <execution> + <id>tag-image-with-version</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName> - <pushImage>true</pushImage> </configuration> </execution> <execution> - <id>tag-and-push-image-with-version-and-date</id> - <phase>deploy</phase> + <id>push-image-with-version</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName> + </configuration> + </execution> + <execution> + <id>tag-image-with-version-and-date</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> - <newName> - ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp} - </newName> - <pushImage>true</pushImage> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName> + </configuration> + </execution> + <execution> + <id>push-image-with-version-and-date</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</imageName> </configuration> </execution> </executions> |