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 /vnfm-simulator/packages | |
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 'vnfm-simulator/packages')
-rw-r--r-- | vnfm-simulator/packages/docker/pom.xml | 168 | ||||
-rw-r--r-- | vnfm-simulator/packages/docker/src/main/docker/Dockerfile | 28 | ||||
-rw-r--r-- | vnfm-simulator/packages/docker/src/main/docker/start-app.sh | 38 | ||||
-rw-r--r-- | vnfm-simulator/packages/pom.xml | 50 |
4 files changed, 0 insertions, 284 deletions
diff --git a/vnfm-simulator/packages/docker/pom.xml b/vnfm-simulator/packages/docker/pom.xml deleted file mode 100644 index 5d67d57521..0000000000 --- a/vnfm-simulator/packages/docker/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ -<!-- ============LICENSE_START======================================================= - Copyright (C) 2019 Nordix Foundation. ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. You may obtain a copy - of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. SPDX-License-Identifier: - Apache-2.0 ============LICENSE_END========================================================= --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.svnfm</groupId> - <artifactId>packages</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <packaging>pom</packaging> - <artifactId>docker</artifactId> - <name>Docker Images</name> - <description>Docker Images</description> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <svnfm.project.version>${project.version}</svnfm.project.version> - <docker.skip>false</docker.skip> - <docker.skip.build>false</docker.skip.build> - <docker.skip.push>false</docker.skip.push> - <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> - <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> - <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> - </properties> - - <build> - <finalName>${project.artifactId}-${project.version}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - println 'Project version: ' + - project.properties['svnfm.project.version']; - def versionArray; - if - ( - project.properties['svnfm.project.version'] != null ) { - versionArray = - project.properties['svnfm.project.version'].split('-'); - } - - if ( - project.properties['svnfm.project.version'].endsWith("-SNAPSHOT") - ) - { - project.properties['project.docker.latesttag.version']=versionArray[0] - + "-SNAPSHOT-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] - + "-STAGING-latest"; - } - - println 'New tag for docker: ' + - project.properties['project.docker.latesttag.version']; - </source> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.19.1</version> - - <configuration> - <verbose>true</verbose> - <apiVersion>1.23</apiVersion> - <pullRegistry>${docker.pull.registry}</pullRegistry> - <pushRegistry>${docker.push.registry}</pushRegistry> - - <images> - <image> - <name>onap/svnfm/simulator</name> - <build> - <cleanup>try</cleanup> - <dockerFile>Dockerfile</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.svnfm:simulator</include> - </includes> - <outputFileNameMapping>app.jar</outputFileNameMapping> - </dependencySet> - </dependencySets> - </inline> - </assembly> - </build> - </image> - </images> - </configuration> - - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - </configuration> - </execution> - - <execution> - <id>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - <configuration> - <image>onap/svnfm/simulator</image> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/vnfm-simulator/packages/docker/src/main/docker/Dockerfile b/vnfm-simulator/packages/docker/src/main/docker/Dockerfile deleted file mode 100644 index 2ccc8035f3..0000000000 --- a/vnfm-simulator/packages/docker/src/main/docker/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM openjdk:8-jdk-alpine - -ARG http_proxy -ENV HTTP_PROXY=$http_proxy -ENV http_proxy=$HTTP_PROXY -ARG https_proxy -ENV HTTPS_PROXY=$https_proxy -ENV https_proxy=$HTTPS_PROXY - -RUN apk add --no-cache --update busybox-extras bash zip unzip curl wget openssh maven openjdk8 jq httpie py-pip - -RUN mkdir /app && mkdir /app/config && mkdir /app/certificates && mkdir /app/logs && mkdir /app/ca-certificates - -COPY maven/app.jar /app -#COPY configs/logging/logback-spring.xml /app -COPY start-app.sh /app -#COPY ca-certificates/onap-ca.crt /app/ca-certificates/onap-ca.crt - -RUN chown -R svnfm:svnfm /app && chmod 700 /app/*.sh - -# Springboot configuration (required) -VOLUME /app/config - -# Root certificates (optional) -VOLUME /app/ca-certificates - -WORKDIR /app -CMD ["/app/start-app.sh"]
\ No newline at end of file diff --git a/vnfm-simulator/packages/docker/src/main/docker/start-app.sh b/vnfm-simulator/packages/docker/src/main/docker/start-app.sh deleted file mode 100644 index 36657f2ddc..0000000000 --- a/vnfm-simulator/packages/docker/src/main/docker/start-app.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ -SVNFM_HOME=/opt/app/svnfm - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -else - CONFIG_FILE=${CONFIG_FILE} -fi - -if [ -z "$CONFIG_FILE" ] - then - CONFIG_FILE="/etc/defaultConfig.json" -fi - -echo "SVNFM Config File path: $CONFIG_FILE" - -$JAVA_HOME/bin/java -cp "$SVNFM_HOME/etc:$SVNFM_HOME/lib/*" -#-Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" diff --git a/vnfm-simulator/packages/pom.xml b/vnfm-simulator/packages/pom.xml deleted file mode 100644 index a5ca8b2816..0000000000 --- a/vnfm-simulator/packages/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ -<!-- ============LICENSE_START======================================================= - Copyright (C) 2019 Nordix Foundation. ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. You may obtain a copy - of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. SPDX-License-Identifier: - Apache-2.0 ============LICENSE_END========================================================= --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.svnfm</groupId> - <artifactId>simulator</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <artifactId>packages</artifactId> - <packaging>pom</packaging> - <name>SVNFM Simulator Packages</name> - - - <profiles> - <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! --> - - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - - <!-- Those profile are exclusive, choose docker or with-integration-tests --> - <profile> - <id>docker</id> - <modules> - <module>docker</module> - </modules> - <properties> - <!-- For this profile we probably don't want to skip the docker push - (if deploy goal is specified) --> - <docker.skip.push>false</docker.skip.push> - </properties> - </profile> - </profiles> -</project>
\ No newline at end of file |