diff options
author | AndrewLamb <andrew.a.lamb@est.tech> | 2019-10-07 15:48:25 +0100 |
---|---|---|
committer | AndrewLamb <andrew.a.lamb@est.tech> | 2019-10-08 10:49:20 +0100 |
commit | 1373c30ec881e04db719ecafa45598d3ff88480e (patch) | |
tree | c1b2243191031acabef386d372bccfb8272d1d93 /packages/docker | |
parent | db90144322187faee71622702bff58c43a2af300 (diff) |
VNFM Simulator Removed. Moved to CSIT.
Change-Id: I6c439615d52751578200ef84aacb20b0263b3846
Issue-ID: SO-1952
Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
Diffstat (limited to 'packages/docker')
-rw-r--r-- | packages/docker/pom.xml | 32 | ||||
-rw-r--r-- | packages/docker/src/main/docker/docker-files/scripts/start-app.sh | 4 |
2 files changed, 1 insertions, 35 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 611e2d293d..3f033574c5 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -331,31 +331,6 @@ </assembly> </build> </image> - <image> - <name>${docker.image.prefix}/vnfm-simulator</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> - </tags> - <assembly> - <inline> - <dependencySets> - <dependencySet> - <includes> - <include>org.onap.so.vnfm:vnfm-service</include> - </includes> - <outputFileNameMapping>app.jar</outputFileNameMapping> - </dependencySet> - </dependencySets> - </inline> - </assembly> - </build> - </image> </images> </configuration> @@ -387,7 +362,7 @@ <goal>push</goal> </goals> <configuration> - <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/vnfm-simulator</image> + <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring</image> </configuration> </execution> </executions> @@ -455,10 +430,5 @@ <artifactId>so-monitoring-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.onap.so.vnfm</groupId> - <artifactId>vnfm-service</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh index cb2f35b87f..cb5586d61d 100644 --- a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh @@ -52,10 +52,6 @@ if [ ${APP} = "so-monitoring" ]; then ln -s ${LOG_PATH} MONITORING fi -if [ ${APP} = "vnfm-simulator" ]; then - ln -s ${LOG_PATH} SIMULATOR -fi - if [ ${APP} = "openstack-adapter" ]; then export DISABLE_SNI="-Djsse.enableSNIExtension=false" fi |