update init scripts

Change-Id: I3738e23803a0ec3da42ee55f31d7c342245e1c52
Signed-off-by: platania <platania@research.att.com>

diff --git a/.DS_Store b/.DS_Store
index 1fd6750..c8c4dab 100644 (file)
Binary files a/.DS_Store and b/.DS_Store differ

diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh
index 7a92fc4..3a43719 100644 (file)
--- a/boot/aai_vm_init.sh
+++ b/boot/aai_vm_init.sh
@@ -19,7 +19,7 @@ sleep 180
 
 docker pull $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest
 docker rm -f aai-service
-docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e GITLAB_CERTNAME=$GITLAB_CERTNAME -e GITLAB_USERNAME=$GITLAB_USERNAME -e GITLAB_PASSWORD=$GITLAB_PASSWD -e AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=develop $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest
+docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e GITLAB_CERTNAME=$GITLAB_CERTNAME -e GITLAB_USERNAME=$GITLAB_USERNAME -e GITLAB_PASSWORD=$GITLAB_PASSWD -e AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=master $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest
 
 docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:latest
 docker rm -f model-loader-service

diff --git a/boot/asdc_ext_volume_partitions.txt b/boot/asdc_ext_volume_partitions.txt
index c06a82e..b00c6ae 100644 (file)
--- a/boot/asdc_ext_volume_partitions.txt
+++ b/boot/asdc_ext_volume_partitions.txt
@@ -1,7 +1,7 @@
 # partition table of /dev/xvdb
 unit: sectors
 
-/dev/vdb1 : start=     2048, size=209713152, Id=83
-/dev/vdb2 : start=        0, size=        0, Id= 0
-/dev/vdb3 : start=        0, size=        0, Id= 0
-/dev/vdb4 : start=        0, size=        0, Id= 0
+/dev/xvdb1 : start=     2048, size=209713152, Id=83
+/dev/xvdb2 : start=        0, size=        0, Id= 0
+/dev/xvdb3 : start=        0, size=        0, Id= 0
+/dev/xvdb4 : start=        0, size=        0, Id= 0

diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh
index 582a3f2..2e7ebce 100644 (file)
--- a/boot/robot_vm_init.sh
+++ b/boot/robot_vm_init.sh
@@ -7,13 +7,15 @@ NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
 
 #
 # Deploy latest robot configuration 
-# 
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/robot_properties_ete.py  $NEXUS_REPO/org.openecomp.boot/robot_properties_ete.py
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/robot_preload_parameters.py  $NEXUS_REPO/org.openecomp.boot/robot_preload_parameters.py
-wget --user=$NEXUS_USERNAME --password=$NEXUS_PASSWD --no-check-certificate -O /opt/eteshare/config/vm_config2robot.sh  $NEXUS_REPO/org.openecomp.boot/vm_config2robot.sh
+#
+cd /opt/testsuite/properties
+git pull
+cp integration_* /opt/eteshare/config
+cp vm_config2robot.sh /opt/eteshare/config
+
 /bin/bash /opt/eteshare/config/vm_config2robot.sh
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecompete
+docker pull $NEXUS_DOCKER_REPO/openecomp/testsuite
 docker rm -f openecompete_container
-docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/openecompete
+docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/openecomp/testsuite