From 3406b48e1526dd7723f534d8d36ad183b01cbd06 Mon Sep 17 00:00:00 2001
From: liangke <lokyse@163.com>
Date: Mon, 25 Sep 2017 15:09:28 +0800
Subject: Add staging maven plugin in vio pom

1 push source code file to staging repository
2 push staging image

Change-Id: Icebcaba5f5f7e68b869015eb028de687eca7b624
Issue-Id: MULTICLOUD-107
Signed-off-by: liangke <lokyse@163.com>
---
 pom.xml                   | 52 +--------------------------------------------
 vio/docker/build_image.sh |  6 ++++--
 vio/pom.xml               | 54 +----------------------------------------------
 3 files changed, 6 insertions(+), 106 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c4cd53..bdbc159 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
     <artifactId>multicloud-vio</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-opentack-vmware</name>
     <description>multicloud vio</description>
@@ -32,29 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-	<sitePath>/content/sites/site/org/onap/multicloud/openstack/vmware/${project.artifactId/${project.version}</sitePath>
     </properties>
-    <distributionManagement>
-        <repository>
-	    <site>
-	      <id>ecomp-site</id>
-	      <url>dav:${nexusproxy}${sitePath}</url>
-	    </site>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ECOMP Staging Repository</name>
-            <url>${nexusproxy}/content/repositories/staging/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </repository>
-    </distributionManagement>
     <build>
     <plugins>
     <plugin>
@@ -68,34 +46,6 @@
             <serverId>ecomp-staging</serverId>
         </configuration>
     </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-javadoc-plugin</artifactId>
-      <version>2.10.4</version>
-      <configuration>
-        <failOnError>false</failOnError>
-        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-        <docletArtifact>
-          <groupId>org.umlgraph</groupId>
-          <artifactId>umlgraph</artifactId>
-          <version>5.6</version>
-        </docletArtifact>
-        <additionalparam>-views</additionalparam>
-        <useStandardDocletOptions>true</useStandardDocletOptions>
-      </configuration>
-    </plugin>
-    <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.6</version>
-        <dependencies>
-        <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav-jackrabbit</artifactId>
-        <version>2.10</version>
-        </dependency>
-        </dependencies>
-    </plugin>
     </plugins>
     </build>
 </project>
diff --git a/vio/docker/build_image.sh b/vio/docker/build_image.sh
index b1e691b..ff2fbdf 100755
--- a/vio/docker/build_image.sh
+++ b/vio/docker/build_image.sh
@@ -7,6 +7,7 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 VERSION="1.0.0-SNAPSHOT"
+STAGING="1.0.0-STAGING"
 PROJECT="multicloud"
 IMAGE="vio"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -21,14 +22,15 @@ fi
 
 function build_image {
     echo "Start build docker image: ${IMAGE_NAME}"
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .
 }
 
 function push_image {
     echo "Start push docker image: ${IMAGE_NAME}"
     docker push ${IMAGE_NAME}:${VERSION}
     docker push ${IMAGE_NAME}:latest
-}
+    docker push ${IMAGE_NAME}:${STAGING}
+} 
 
 build_image
 push_image
diff --git a/vio/pom.xml b/vio/pom.xml
index f12576f..428832b 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack.vmware</groupId>
     <artifactId>multicloud-vio</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-opentack-vmware</name>
     <description>multicloud vio</description>
@@ -33,30 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <sitePath>/content/sites/site/org/onap/multicloud/openstack/vmware/${project.artifactId/${project.version}</sitePath>
     </properties>
-    <distributionManagement>
-        <repository>
-	    <site>
-	      <id>ecomp-site</id>
-	      <url>dav:${nexusproxy}${sitePath}</url>
-	    </site>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ECOMP Staging Repository</name>
-            <url>${nexusproxy}/content/repositories/staging/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </repository>
-    </distributionManagement>
-
     <build>
       <plugins>
         <plugin>
@@ -88,35 +65,6 @@
                 <serverId>ecomp-staging</serverId>
              </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
-          <configuration>
-            <failOnError>false</failOnError>
-            <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-            <docletArtifact>
-              <groupId>org.umlgraph</groupId>
-              <artifactId>umlgraph</artifactId>
-              <version>5.6</version>
-            </docletArtifact>
-            <additionalparam>-views</additionalparam>
-            <useStandardDocletOptions>true</useStandardDocletOptions>
-          </configuration>
-        </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.6</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.wagon</groupId>
-                        <artifactId>wagon-webdav-jackrabbit</artifactId>
-                        <version>2.10</version>
-                    </dependency>
-                </dependencies>
-          </plugin>
-
       </plugins>
     </build>
 </project>
-- 
cgit 1.2.3-korg