Fix root pom version definition

[sdnc/oam.git] / csit / plans / sdnc / setup.sh

diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh
index ec5d9b9..9178358 100644 (file)
--- a/csit/plans/sdnc/setup.sh
+++ b/csit/plans/sdnc/setup.sh
@@ -18,11 +18,18 @@
 # Modifications copyright (c) 2021 AT&T Intellectual Property
 #
 
-# Remove all dangling images
+# Remove all dangling images and cleanup /w/workspace and /tmp
 docker image prune -f
+echo "Remove onap repository artifacts"
+rm -r /tmp/r/org/onap
+echo "Remove all target folders from workspace"
+rm -r $(find /w/workspace -name target)
 
 ###################### Netconf Simulator Setup ######################
 
+echo "Clean"
+sudo apt clean
+
 # Get integration/simulators
 if [ -d ${WORKSPACE}/archives/pnf-simulator ]
 then
@@ -109,10 +116,8 @@ fi
 num_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1)
 
   if [ "$num_bundles" -ge 333 ]; then
-    num_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1)
-
-    num_failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure | wc -l)
-    failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure)
+    num_failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep -w Failure | wc -l)
+    failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep -w Failure)
     echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
   fi
 
@@ -149,20 +154,6 @@ cp ${REQUEST_DATA_PATH}/mount.xml.tmpl ${REQUEST_DATA_PATH}/mount.xml
 sed -i "s/pnfaddr/${LOCAL_IP}/g" "${REQUEST_DATA_PATH}"/mount.xml
 
 
-# Load test dgs
-docker exec ${SDNC_CONTAINER_NAME} mkdir -p /tmp/gra.patch
-
-for file in ${WORKSPACE}/plans/sdnc/testdata/*xml
-do
-    docker cp $file ${SDNC_CONTAINER_NAME}:/tmp/gra.patch
-    mname=$(basename $file | cut -d. -f1| cut -d_ -f1)
-    bname=$(basename $file | cut -d. -f1| cut -d_ -f2-)
-    echo ${mname} ${bname} aai-disabled sync >> ${WORKSPACE}/archives/graph.versions
-done
-docker cp ${WORKSPACE}/archives/graph.versions ${SDNC_CONTAINER_NAME}:/tmp/gra.patch
-docker exec ${SDNC_CONTAINER_NAME} /opt/onap/sdnc/svclogic/bin/svclogic.sh install /tmp/gra.patch /opt/onap/sdnc/svclogic/config/svclogic.properties
-
-
 #########################################################################
 
 # Export SDNC, AAF-Certservice-Cient, Netconf-Pnp-Simulator Continer Names