diff options
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/aaf/aafapi/setup.sh | 171 | ||||
| -rw-r--r-- | plans/aaf/aafapi/teardown.sh | 12 | ||||
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/setup.sh | 14 | ||||
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/teardown.sh | 1 | ||||
| -rwxr-xr-x | plans/dmaap-datarouter/dr-suite/setup.sh | 4 | ||||
| -rwxr-xr-x | plans/dmaap-datarouter/dr-suite/teardown.sh | 2 | ||||
| -rwxr-xr-x | plans/dmaap/mrpubsub/setup.sh | 31 | ||||
| -rw-r--r-- | plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 10 | ||||
| -rw-r--r-- | plans/usecases/5G-bulkpm/setup.sh | 12 | ||||
| -rw-r--r-- | plans/usecases/5G-bulkpm/teardown.sh | 5 | ||||
| -rw-r--r-- | plans/vid/healthCheck/setup.sh | 3 | ||||
| -rw-r--r-- | plans/vid/healthCheck/teardown.sh | 1 | ||||
| -rw-r--r-- | plans/vid/healthCheck/testplan.txt | 1 |
13 files changed, 185 insertions, 82 deletions
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index dd6cb29e..95b35e43 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -25,52 +25,169 @@ source ${SCRIPTS}/common_functions.sh # Clone AAF Authz repo -mkdir -p $WORKSPACE/archives/aafcsit -cd $WORKSPACE/archives/aafcsit -#unset http_proxy https_proxy +mkdir -p $WORKSPACE/archives/opt +cd $WORKSPACE/archives/opt + + +HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') +export HOST_IP=${HOST_IP} + +CURRENT_DIR=$(pwd) export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +NEXUS_USERNAME=anonymous +NEXUS_PASSWD=anonymous +NEXUS_DOCKER_REPO=nexus3.onap.org:10001 +AAF_DOCKER_VERSION=2.1.3 + +docker login -u $NEXUS_USERNAME -p "$NEXUS_PASSWD" $NEXUS_DOCKER_REPO + +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_config:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_service:$AAF_DOCKER_VERSION + +docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION git clone --depth 1 http://gerrit.onap.org/r/aaf/authz -b master git pull -cd $WORKSPACE/archives/aafcsit/authz/auth/auth-service/src/main/resources/docker-compose +chmod -R 777 authz +cd authz +CURRENT_DIR=$(pwd) + pwd -chmod -R 777 $WORKSPACE/archives/aafcsit/authz/auth/auth-service/src/main/resources/docker-compose +if [ ! -e auth/csit/d.props ]; then + cp auth/csit/d.props.init auth/csit/d.props +fi -# start aaf containers with docker compose and configuration from docker-compose.yml -docker-compose up -d -export aaf_service=$(get_docker_compose_service aaf_container) -export cassandra_service=$(get_docker_compose_service cassandra_container) +if [ ! -e auth/docker/d.props ]; then + cp auth/docker/d.props.init auth/docker/d.props +fi -# Wait for initialization of Docker container for AAF & Cassandra -for i in {1..12}; do - if [ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ] - then - echo "AAF Service Running" - break - else - echo sleep $i - sleep $i - fi + +NEXUS_USERNAME=anonymous +NEXUS_PASSWD=anonymous +NEXUS_DOCKER_REPO=nexus3.onap.org:10001 +sed -i "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$NEXUS_DOCKER_REPO/" auth/csit/d.props +. auth/csit/d.props + +sed -i "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$NEXUS_DOCKER_REPO/" auth/docker/d.props +. auth/docker/d.props + + +HOSTNAME=`hostname` +FQDN=aaf.api.simpledemo.onap.org +HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') +export HOST_IP=${HOST_IP} + + +CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4` +CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP + +cd auth/auth-cass/docker +if [ "`docker container ls | grep aaf_cass`" = "" ]; then + # Cassandra Install + echo Cassandra Install + bash ./dinstall.sh +fi + +CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4` +CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP +if [ ! -e $WORKSPACE/archives/opt/authz/auth/csit/cass.props ]; then + cp $WORKSPACE/archives/opt/authz/auth/csit/cass.props.init $WORKSPACE/archives/opt/authz/auth/csit/cass.props +fi + +sed -i "s/CASS_HOST=.*/CASS_HOST="$CASS_HOST"/g" $WORKSPACE/archives/opt/authz/auth/csit/cass.props + +if [ ! -e $WORKSPACE/archives/opt/authz/auth/docker/cass.props ]; then + cp $WORKSPACE/archives/opt/authz/auth/docker/cass.props.init $WORKSPACE/archives/opt/authz/auth/docker/cass.props +fi + +sed -i "s/CASS_HOST=.*/CASS_HOST="$CASS_HOST"/g" $WORKSPACE/archives/opt/authz/auth/docker/cass.props +# TODO Pull from Config Dir +if [ "$LATITUDE" = "" ]; then + LATITUDE=37.781 + LONGITUDE=-122.261 + sed -i "s/LATITUDE=.*/LATITUDE=$LATITUDE/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props + sed -i "s/LONGITUDE=.*/LONGITUDE=$LONGITUDE/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props +fi + +sed -i "s/VERSION=.*/VERSION=$VERSION/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props +sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props +sed -i "s/HOST_IP=.*/HOST_IP=$HOST_IP/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props +sed -i "s/AAF_REGISTER_AS=.*/AAF_REGISTER_AS=$FQDN/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props + +pwd + +cd ../../ + +pwd + +cd csit +tty +# Need new Deployment system properties +bash ./aaf.sh + +# run it +bash ./drun.sh + +docker images + +docker ps -a + +cat /etc/sudoers + +docker logs aaf_hello + +docker logs aaf_locate + +docker logs aaf_cm + +docker logs aaf_gui + +docker logs aaf_fs + +docker logs aaf_oauth + +docker logs aaf_service + +# Wait for initialization of Docker containers +for i in {1..50}; do + if [ $(docker inspect --format '{{ .State.Running }}' aaf_hello) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_cm) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_fs) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_gui) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_oauth) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_locate) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' aaf_service) ] + then + echo "aaf Service Running" + break + else + echo sleep $i + sleep $i + fi done -AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $aaf_service) -CASSANDRA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $cassandra_service) -bypass_ip_adress $AAF_IP -bypass_ip_adress $CASSANDRA_IP +AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service) +CASSANDRA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_cass) echo AAF_IP=${AAF_IP} echo CASSANDRA_IP=${CASSANDRA_IP} - # Wait for initialization of docker services for i in {1..12}; do - curl -sS -m 1 ${AAF_IP}:8101 && break + curl -k -u aaf_admin@people.osaaf.org:demo123456! https://${AAF_IP}:8100/authz/nss/org.osaaf.people && break echo sleep $i sleep $i done #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}" +ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}"
\ No newline at end of file diff --git a/plans/aaf/aafapi/teardown.sh b/plans/aaf/aafapi/teardown.sh index 41e0b00e..742a1b36 100644 --- a/plans/aaf/aafapi/teardown.sh +++ b/plans/aaf/aafapi/teardown.sh @@ -17,8 +17,12 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -kill-instance.sh $aaf_service -kill-instance.sh $cassandra_service -unset aaf_service -unset cassandra_service +kill-instance.sh aaf_service +kill-instance.sh aaf_locate +kill-instance.sh aaf_hello +kill-instance.sh aaf_cm +kill-instance.sh aaf_gui +kill-instance.sh aaf_fs +kill-instance.sh aaf_oauth +kill-instance.sh aaf_cass diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh index 00892d6b..9040ae60 100644 --- a/plans/dcaegen2/prh-testsuites/setup.sh +++ b/plans/dcaegen2/prh-testsuites/setup.sh @@ -3,6 +3,7 @@ source ${SCRIPTS}/common_functions.sh export PRH_SERVICE="prh" +export SSL_PRH_SERVICE="ssl_prh" export DMAAP_SIMULATOR="dmaap_simulator" export AAI_SIMULATOR="aai_simulator" @@ -14,23 +15,24 @@ pip install -U docker docker-compose up -d --build PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE}) +SSL_PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${SSL_PRH_SERVICE}) DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR}) AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR}) bypass_ip_adress ${PRH_IP} +bypass_ip_adress ${SSL_PRH_IP} bypass_ip_adress ${DMAAP_SIMULATOR_IP} bypass_ip_adress ${AAI_SIMULATOR_IP} echo PRH_IP=${PRH_IP} +echo SSL_PRH_IP=${SSL_PRH_IP} echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP} echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP} # Wait for initialization of PRH services -for i in {1..10}; do - curl -sS -m 1 localhost:8100/heartbeat && break - echo sleep ${i} - sleep ${i} -done +wait_for_service_init localhost:8100/heartbeat +wait_for_service_init localhost:8200/heartbeat # #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v PRH:${PRH_IP}:8100" +ROBOT_VARIABLES="-v DMAAP_SIMULATOR_SETUP:${DMAAP_SIMULATOR_IP}:2224 -v AAI_SIMULATOR_SETUP:${AAI_SIMULATOR_IP}:3335" + diff --git a/plans/dcaegen2/prh-testsuites/teardown.sh b/plans/dcaegen2/prh-testsuites/teardown.sh index bd1e5ba0..45a3b8b1 100644 --- a/plans/dcaegen2/prh-testsuites/teardown.sh +++ b/plans/dcaegen2/prh-testsuites/teardown.sh @@ -16,5 +16,6 @@ # kill-instance.sh prh +kill-instance.sh ssl_prh kill-instance.sh dmaap_simulator kill-instance.sh aai_simulator diff --git a/plans/dmaap-datarouter/dr-suite/setup.sh b/plans/dmaap-datarouter/dr-suite/setup.sh index 023e2658..dedf15b0 100755 --- a/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/plans/dmaap-datarouter/dr-suite/setup.sh @@ -9,7 +9,7 @@ cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master cd datarouter git pull -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources sed -i 's/10003/10001/g' docker-compose.yml # start DMaaP DR containers with docker compose and configuration from docker-compose.yml @@ -17,7 +17,7 @@ docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb -for i in {1..50}; do +for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] diff --git a/plans/dmaap-datarouter/dr-suite/teardown.sh b/plans/dmaap-datarouter/dr-suite/teardown.sh index 033a0015..8e568691 100755 --- a/plans/dmaap-datarouter/dr-suite/teardown.sh +++ b/plans/dmaap-datarouter/dr-suite/teardown.sh @@ -1,4 +1,4 @@ #!/bin/bash -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources docker-compose down -v diff --git a/plans/dmaap/mrpubsub/setup.sh b/plans/dmaap/mrpubsub/setup.sh index 4a363042..5a670d28 100755 --- a/plans/dmaap/mrpubsub/setup.sh +++ b/plans/dmaap/mrpubsub/setup.sh @@ -34,40 +34,12 @@ cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ -# start DMaaP MR containers with docker compose and configuration from docker-compose.yml -docker login -u docker -p docker nexus3.onap.org:10001 -docker-compose up -d - -# Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper -for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' dockercompose_dmaap_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' dockercompose_zookeeper_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' dockercompose_dmaap_1) ] - then - echo "DMaaP Service Running" - break - else - echo sleep $i - sleep $i - fi -done - - -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_dmaap_1) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_kafka_1) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_zookeeper_1) - -echo DMAAP_MR_IP=${DMAAP_MR_IP} -echo KAFKA_IP=${KAFKA_IP} -echo ZOOKEEPER_IP=${ZOOKEEPER_IP} - -# Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites -docker-compose down # Update kafkfa and zookeeper properties in MsgRtrApi.propeties which will be copied to DMaaP Container sed -i -e 's/<zookeeper_host>/zookeeper/' /var/tmp/MsgRtrApi.properties sed -i -e 's/<kafka_host>:<kafka_port>/kafka:9092/' /var/tmp/MsgRtrApi.properties +# start DMaaP MR containers with docker compose and configuration from docker-compose.yml docker-compose build docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d @@ -90,7 +62,6 @@ DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPA KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_kafka_1) ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_zookeeper_1) -echo "After Kafka and Zookeeper ip addresses updated" echo DMAAP_MR_IP=${DMAAP_MR_IP} echo KAFKA_IP=${KAFKA_IP} echo ZOOKEEPER_IP=${ZOOKEEPER_IP} diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index b9085d6e..c5567d81 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -9,9 +9,9 @@ services: - "8443:8443" - "8080:8080" volumes: - - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties - - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt - - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt + - ../prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties + - ../prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt + - ../prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt depends_on: mariadb_container: condition: service_healthy @@ -29,7 +29,7 @@ services: - "9443:8443" - "9090:8080" volumes: - - ./node_data/node.properties:/opt/app/datartr/etc/node.properties + - ../node_data/node.properties:/opt/app/datartr/etc/node.properties depends_on: datarouter-prov: condition: service_healthy @@ -41,7 +41,7 @@ services: ports: - "7070:7070" volumes: - - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties + - ../subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties mariadb_container: image: mariadb:10.2.14 diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 8dfcfe40..5139cbab 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -6,6 +6,7 @@ source ${SCRIPTS}/common_functions.sh mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master +sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ @@ -53,10 +54,11 @@ sleep 5 mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master -cd datarouter -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ -rm -rf docker-compose.yml -cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources +mkdir docker-compose +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose +cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml + docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d docker kill datarouter-prov @@ -65,7 +67,7 @@ docker kill vescollector HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') sed -i -e '/DMAAPHOST:/ s/:.*/: '$HOST_IP'/' docker-compose.yml MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb ) -sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/prov_data/provserver.properties +sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties docker-compose up -d # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh index 0c86623b..d72345e4 100644 --- a/plans/usecases/5G-bulkpm/teardown.sh +++ b/plans/usecases/5G-bulkpm/teardown.sh @@ -1,7 +1,8 @@ #!/bin/bash echo "Starting teardown script" -docker exec dfc /bin/sh -c "cat /opt/log/application.log" -sleep 5 +docker exec dfc /bin/sh -c "less /opt/log/application.log" > /tmp/dfc_docker.log +cat /tmp/dfc_docker.log +sleep 3 kill-instance.sh $DMAAP kill-instance.sh $KAFKA kill-instance.sh $ZOOKEEPER diff --git a/plans/vid/healthCheck/setup.sh b/plans/vid/healthCheck/setup.sh index a0ed2262..38dddf54 100644 --- a/plans/vid/healthCheck/setup.sh +++ b/plans/vid/healthCheck/setup.sh @@ -32,3 +32,6 @@ echo BE_IP=${BE_IP} # Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v BE_IP:${BE_IP}" + +pip install assertpy +pip install requests
\ No newline at end of file diff --git a/plans/vid/healthCheck/teardown.sh b/plans/vid/healthCheck/teardown.sh index 01383179..14fd0522 100644 --- a/plans/vid/healthCheck/teardown.sh +++ b/plans/vid/healthCheck/teardown.sh @@ -18,5 +18,6 @@ # source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh +docker kill so-simulator # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/plans/vid/healthCheck/testplan.txt b/plans/vid/healthCheck/testplan.txt index cb5e2798..20add7af 100644 --- a/plans/vid/healthCheck/testplan.txt +++ b/plans/vid/healthCheck/testplan.txt @@ -2,3 +2,4 @@ # Place the suites in run order. vid/healthCheck vid/login +vid/https-connection |