diff options
Diffstat (limited to 'test/ete/scripts')
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 16 | ||||
| -rwxr-xr-x | test/ete/scripts/run-healthcheck.sh | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index b580351dd..182e398ca 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -1,10 +1,11 @@ #!/bin/bash -x -if [ "$#" -ne 1 ]; then - echo "Usage: $0 <lab-name>" +if [ "$#" -lt 1 ]; then + echo "Usage: $0 <lab-name> [<demo repo directory>]" exit 1 fi + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi @@ -19,19 +20,24 @@ fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh +DEMO_DIR=${ONAP_WORKDIR}/demo +if [ "$#" -ge 2 ]; then + DEMO_DIR=$2 +fi + SENTINEL='Docker versions and branches' mkdir -p ${LAB_DIR}/target YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml ENV_FILE=${LAB_DIR}/target/onap_openstack.env -YAML_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -ENV_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.env +YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml +ENV_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.env # copy heat template to WORKSPACE cp ${YAML_SRC} ${YAML_FILE} # generate final env file -pushd ${ONAP_WORKDIR}/demo +pushd ${DEMO_DIR} envsubst < ${LAB_DIR}/onap-openstack-template.env | sed -n "1,/${SENTINEL}/p" > ${ENV_FILE} echo " # Rest of the file was AUTO-GENERATED from" | tee -a ${ENV_FILE} echo " #" $(git config --get remote.origin.url) heat/ONAP/onap_openstack.env $(git rev-parse HEAD) | tee -a ${ENV_FILE} diff --git a/test/ete/scripts/run-healthcheck.sh b/test/ete/scripts/run-healthcheck.sh index e2ed3986f..e97ac3ff5 100755 --- a/test/ete/scripts/run-healthcheck.sh +++ b/test/ete/scripts/run-healthcheck.sh @@ -19,10 +19,12 @@ fi ssh-keygen -R ${ROBOT_IP} +set +x timeout 15m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh RESULT=$? +set -x -LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1") +LOG_DIR=$(ssh -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | grep health | head -1") echo "Browse Robot results at http://${ROBOT_IP}:88/logs/${LOG_DIR}/" -rsync -e "ssh -i ${SSH_KEY}" -avPz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ +rsync -e "ssh -i ${SSH_KEY}" -avtz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ exit $RESULT |