<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START==========================================
+ONAP : APPC
+===================================================================
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+===================================================================
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the License);
+you may not use this software 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.
+============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/maven-v4_0_0.xsd">
<parent>
- <groupId>org.openecomp.appc.deployment</groupId>
+ <groupId>org.onap.appc.deployment</groupId>
<artifactId>installation</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <groupId>org.openecomp.appc.deployment</groupId>
+ <groupId>org.onap.appc.deployment</groupId>
<artifactId>installation-appc</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Installation - APPC Docker</name>
<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
<properties>
- <image.name>openecomp/appc-image</image.name>
- <appc.version>${project.version}</appc.version>
+ <image.name>onap/appc-image</image.name>
+ <appc.release.version>1.7.1</appc.release.version>
+ <appc.snapshot.version>1.8.0-SNAPSHOT</appc.snapshot.version>
<!--This version will be over-ridden by jenkins
injecting the version.properties variable file during docker build-->
<appc.docker.staging.version>1.0.0</appc.docker.staging.version>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+ <!--Determines the version of the cdt-proxy-service to download and install-->
+ <appc.cdt.version>1.7.1</appc.cdt.version>
+ <docker.plugin.version>0.28.0</docker.plugin.version>
</properties>
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
+ <include>keystore</include>
<include>*.dump</include>
+ <include>*.sh</include>
+ <include>*.cfg</include>
+ <include>*.xml</include>
+ <include>*.json</include>
+ <include>*.properties</include>
</includes>
<filtering>false</filtering>
</resource>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
<resources>
<resource>
<directory>../src/main/stores</directory>
<includes>
<include>*.jks</include>
<include>*.p12</include>
+ <include>*keyfile</include>
</includes>
<filtering>false</filtering>
</resource>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
<resources>
<resource>
<directory>../src/main/properties</directory>
<includes>
<include>*.properties</include>
+ <include>*.csv</include>
</includes>
<filtering>false</filtering>
</resource>
<executable>bash</executable>
<environmentVariables>
<APPC_VERSION>${appc.version}</APPC_VERSION>
+ <APPC_CDT_VERSION>${appc.cdt.version}</APPC_CDT_VERSION>
<APPC_OAM_VERSION>${project.version}</APPC_OAM_VERSION>
<SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
</environmentVariables>
<arguments>
<argument>${basedir}/src/main/scripts/installZips.sh</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
</arguments>
</configuration>
</execution>
<configuration>
<executable>find</executable>
<arguments>
- <argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>
}
if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
project.properties['dockertag1']=project.properties['ver'] + "-latest";
- project.properties['dockertag2']="latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
+ project.properties['appc.version']=project.properties['appc.snapshot.version'];
} else {
project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+ project.properties['appc.version']=project.properties['appc.release.version'];
}
println 'docker tag 1: ' + project.properties['dockertag1'];
println 'docker tag 2: ' + project.properties['dockertag2'];
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>${docker.plugin.version}</version>
<inherited>false</inherited>
<configuration>
<images>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
+ <include>keystore</include>
<include>*.dump</include>
+ <include>*.sh</include>
+ <include>*.cfg</include>
+ <include>*.xml</include>
+ <include>*.json</include>
+ <include>*.properties</include>
</includes>
<filtering>false</filtering>
</resource>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
<resources>
<resource>
<directory>../src/main/stores</directory>
<includes>
<include>*.jks</include>
<include>*.p12</include>
+ <include>*.keyfile</include>
</includes>
<filtering>false</filtering>
</resource>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
<resources>
<resource>
<directory>../src/main/properties</directory>
<includes>
<include>*.properties</include>
+ <include>*.csv</include>
</includes>
<filtering>false</filtering>
</resource>
</environmentVariables>
<arguments>
<argument>${basedir}/src/main/scripts/installZips.sh</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
+ <argument>${basedir}/target/docker-stage</argument>
</arguments>
</configuration>
</execution>
<configuration>
<executable>find</executable>
<arguments>
- <argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>
</profiles>
<organization>
- <name>openECOMP</name>
+ <name>ONAP</name>
</organization>
</project>
Code Review / appc / deployment.git / blobdiff