X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Frobot_install.sh;h=b17e9fc7dce163dd5b5d518ed191750c42733612;hb=refs%2Fheads%2Famsterdam;hp=81f8e7986b56c152bed6e05ce9f64c4ec02804a3;hpb=df0c0cf6c8eb6bc6d3e4df5c5e3275dc425f4f6f;p=demo.git diff --git a/boot/robot_install.sh b/boot/robot_install.sh index 81f8e798..b17e9fc7 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -8,6 +8,10 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) CODE_REPO=$(cat /opt/config/remote_repo.txt) +HEAT_CODE_REPO=http://gerrit.onap.org/r/demo.git + +# Short-term fix to get around MSO to SO name change +cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -48,9 +52,10 @@ then fi # Download 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 install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh @@ -95,6 +100,7 @@ mkdir -p /opt/eteshare/logs mkdir -p /opt/eteshare/config cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO testsuite/properties +git clone -b $GERRIT_BRANCH --single-branch $HEAT_CODE_REPO demo # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes if [[ $CLOUD_ENV != "rackspace" ]]