From 763734c4d961b06b45f0de2d2247bd2c632c3176 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 18 Jan 2019 12:28:08 -0800 Subject: Update install-feature for pre-install Since the feature zip files will be extracted during docker build, the install-features scripts need to be modified so that the script will not fail when the zip file does not exist, since the zip file will have already been unzipped. Change-Id: I441064226db956addae5c2f238114ce3965c13ef Signed-off-by: Patrick Brady Issue-ID: APPC-1337 --- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- .../src/main/resources/scripts/install-feature.sh | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) (limited to 'appc-adapters') diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh index fff75e1c1..6402f6c32 100755 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh index b360a3352..06e8f20d3 100755 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh index e4685c9c1..836910190 100755 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi COUNT=0 diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh index e4685c9c1..836910190 100755 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi COUNT=0 diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh index e4685c9c1..836910190 100755 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi COUNT=0 diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh index e4685c9c1..836910190 100755 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi COUNT=0 diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh index fff75e1c1..6402f6c32 100755 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then unzip -n -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -- cgit 1.2.3-korg