aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuoc Nghia Nguyen <quocnghia.nguyen@orange.com>2018-04-17 10:54:31 +0200
committerQuoc Nghia Nguyen <quocnghia.nguyen@orange.com>2018-04-17 11:02:16 +0200
commitf1b2933e94f321d4deb4e721812fe06fbf0093df (patch)
tree7e215a229909ae848eb82c561c8e58943fa579b6
parentbab2f61a120f2cd15fe1ee6887a4e6d8ca3d8d5f (diff)
Fix syntax errors in the scripts
Change-Id: Ibcdc69f49d27a8ec5ab136ccdf0009e11aefe45b Issue-ID: EXTAPI-76 Signed-off-by: Quoc Nghia Nguyen <quocnghia.nguyen@orange.com>
-rw-r--r--test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh22
-rw-r--r--test/csit/scripts/externalapi-nbi/start_nbi_containers.sh13
2 files changed, 20 insertions, 15 deletions
diff --git a/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh b/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh
index abb1e2f30..76be3289a 100644
--- a/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh
+++ b/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh
@@ -14,16 +14,20 @@
# limitations under the License.
# ========================================================================
-$NEXUS_USERNAME=docker
-$NEXUS_PASSWD=docker
-$NEXUS_DOCKER_REPO=nexus3.onap.org:10001
-$DOCKER_IMAGE_VERSION=latest
-
echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh"
-# Create directory
-mkdir -p $WORKSPACE/externalapi-nbi
+# Check if docker-compose file exists
+if [ ! -f "$WORKSPACE/externalapi-nbi/docker-compose.yml" ]; then
+ echo 'There is nothing to clean. Exiting...' >&2
+ exit 0
+fi
+
cd $WORKSPACE/externalapi-nbi
-# Remove containers
-docker-compose down
+# Remove containers and attached/anonymous volume(s)
+docker-compose down -v
+# Force stop & remove all containers and volumes
+docker-compose rm -f -s -v
+
+# clean up
+rm -rf $WORKSPACE/externalapi-nbi \ No newline at end of file
diff --git a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
index a81c3bf11..d1a026a67 100644
--- a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
+++ b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
@@ -14,10 +14,10 @@
# limitations under the License.
# ========================================================================
-$NEXUS_USERNAME=docker
-$NEXUS_PASSWD=docker
-$NEXUS_DOCKER_REPO=nexus3.onap.org:10001
-$DOCKER_IMAGE_VERSION=latest
+NEXUS_USERNAME=docker
+NEXUS_PASSWD=docker
+NEXUS_DOCKER_REPO=nexus3.onap.org:10001
+DOCKER_IMAGE_VERSION=latest
echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh"
@@ -26,7 +26,7 @@ mkdir -p $WORKSPACE/externalapi-nbi
cd $WORKSPACE/externalapi-nbi
# Fetch the latest docker-compose.yml
-wget -o docker-compose.yml https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master
+wget -O docker-compose.yml 'https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master'
# Pull the nbi docker image from nexus
# MariaDB and mongoDB will be pulled automatically from docker.io during docker-compose
@@ -34,4 +34,5 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/onap/externalapi/nbi:$DOCKER_IMAGE_VERSION
# Start nbi, MariaDB and MongoDB containers with docker compose and nbi/docker-compose.yml
-docker-compose up -d
+docker-compose up -d mariadb mongo && sleep 5 # to ensure that these services are ready for connections
+docker-compose up -d nbi