From: Patrick Brady <patrick.brady@att.com>
Date: Thu, 11 Oct 2018 06:14:03 +0000 (-0700)
Subject: Directories for build versions
X-Git-Tag: 1.4.4~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b616c0aa6428b5dcf1102639b34b454d7dc8e1cd;hp=bf4e84cb7c39c662b75e76e130108a307c400b66;p=appc%2Fdeployment.git

Directories for build versions

Since Jenkins uses the same build host for all docker builds,
the different versions of appc are all present on the same
system. This causes problems during unzip of the installers.

This change creates a directory in /tmp for each different
version of appc.

Change-Id: I7f7c9fb39110146cf6e1917dd9e80a41b287c57e
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1212
---

diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index 02bdcc7..cbab755 100644
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -82,15 +82,22 @@ APPC_CDT_VERSION=${APPC_CDT_VERSION:-0.0.1}
 APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1}
 AAF_SHIRO_VERSION=${AAF_SHIRO_VERSION:-2.1.0-SNAPSHOT}
 
+tmpDir=/tmp/appc-${APPC_VERSION}
+
 if [ ! -d ${targetDir} ]
 then
   mkdir -p ${targetDir}
 fi
 
+if [ ! -d ${tmpDir} ]
+then
+  mkdir -p ${tmpDir}
+fi
+
 cwd=$(pwd)
 
 mavenOpts="-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"
-cd /tmp
+cd ${tmpDir}
 
 echo "Installing APP-C version ${APPC_VERSION}"
 
@@ -108,20 +115,20 @@ then
   fi
 fi
 
- rm -f /tmp/${feature}-installer*.zip
- mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:${feature}-installer:${APPC_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
- unzip -d ${featureDir}$featureDirNumber /tmp/${feature}-installer*zip
+ rm -f ${tmpDir}/${feature}-installer*.zip
+ mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:${feature}-installer:${APPC_VERSION}:zip -DoutputDirectory=${tmpDir} -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+ unzip -d ${featureDir}$featureDirNumber ${tmpDir}/${feature}-installer*zip
 featureNumber=$(($featureNumber+1))
 done
 
 echo "Installing platform-logic for APP-C"
-rm -f /tmp/platform-logic-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
-unzip -d ${targetDir} /tmp/platform-logic-installer*.zip
+rm -f ${tmpDir}/platform-logic-installer*.zip
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=${tmpDir} -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+unzip -d ${targetDir} ${tmpDir}/platform-logic-installer*.zip
 
 echo "Downloading dg-loader DGs from nexus"
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:appc-dg-provider:${APPC_VERSION} -DoutputDirectory=/tmp
-unzip -d ${targetDir}/svclogic/graphs/appc/json /tmp/appc-dg-provider*.jar json/**
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:appc-dg-provider:${APPC_VERSION} -DoutputDirectory=${tmpDir}
+unzip -d ${targetDir}/svclogic/graphs/appc/json ${tmpDir}/appc-dg-provider*.jar json/**
 mv ${targetDir}/svclogic/graphs/appc/json/json ${targetDir}/svclogic/graphs/appc/json/dg-loader-dgs
 
 echo "Downloading dg-loader-provider jar from nexus"