Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Retrieve demo artifacts via nexus REST API
[demo.git]
/
vnfs
/
vCPE
/
scripts
/
v_aaa_install.sh
diff --git
a/vnfs/vCPE/scripts/v_aaa_install.sh
b/vnfs/vCPE/scripts/v_aaa_install.sh
index
5505d1c
..
c9a9bdf
100644
(file)
--- a/
vnfs/vCPE/scripts/v_aaa_install.sh
+++ b/
vnfs/vCPE/scripts/v_aaa_install.sh
@@
-1,8
+1,8
@@
#!/bin/bash
#!/bin/bash
-REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
-REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
+NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt)
DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
+if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
@@
-48,15
+48,16
@@
then
fi
# Download required dependencies
fi
# Download required dependencies
-add-apt-repository -y ppa:openjdk-r/ppa
+echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
+echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
apt-get update
apt-get update
-apt-get install -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev
+apt-get install -
-allow-unauthenticated -
y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev
sleep 1
# Download DHCP config files
cd /opt
sleep 1
# Download DHCP config files
cd /opt
-
wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION
/v_aaa_init.sh
-
wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION
/v_aaa.sh
+
unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_aaa_init.sh > /opt
/v_aaa_init.sh
+
unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_aaa.sh > /opt
/v_aaa.sh
chmod +x v_aaa_init.sh
chmod +x v_aaa.sh
mv v_aaa.sh /etc/init.d
chmod +x v_aaa_init.sh
chmod +x v_aaa.sh
mv v_aaa.sh /etc/init.d