diff options
| author |   Marcin Migdal <marcin.migdal@nokia.com> | 2018-08-08 15:38:11 +0200 |
|---|---|---|
| committer | Marcin Migdal <marcin.migdal@nokia.com> | 2018-08-08 16:14:50 +0200 |
| commit | 6720a7f1e6a0d35ffca1b7c683e06b77abd1331b (patch) | |
| tree | f45400a818c7bffbe2a98f388760dea45b158ba3 /test/mocks/pnfsimulator/pom.xml | |
| parent | 7e9188b57abc8588e51e8b86204aa718640170cc (diff) | |
Preparing for INT-607
Attempt to fix build
Change-Id: I47e1b77d9f434a5c6a116f42db338e9b08697559
Issue-ID: INT-607
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
Diffstat (limited to 'test/mocks/pnfsimulator/pom.xml')
| -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> |