From 6ddc310d6785bf45a8ccc6d8de8abbeedf490f8a Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Wed, 26 May 2021 17:58:44 +0200
Subject: PM-Mapper CSIT image pulls enhancements

- Add nexus3.onap.org repository to external images
to avoid dockerhub pull limits.
- Remove repository from PM-Mapper image to force use
of image built earlier with maven.
.gitignore update.
- Add DMaaP healthcheck to setup.sh scripts

Issue-ID: DCAEGEN2-2796
Issue-ID: DCAEGEN2-2799
Change-Id: Ie98336b91b37d61767049d4857b016fb618e4e8e
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
---
 csit/plans/filesprocessingconfigpmmapper/setup.sh | 12 ++++++++++++
 csit/plans/pmmapper/docker-compose.yml            |  4 ++--
 csit/plans/pmmapper/setup.sh                      | 11 +++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'csit/plans')

diff --git a/csit/plans/filesprocessingconfigpmmapper/setup.sh b/csit/plans/filesprocessingconfigpmmapper/setup.sh
index 5f0b41b..0a86c0a 100644
--- a/csit/plans/filesprocessingconfigpmmapper/setup.sh
+++ b/csit/plans/filesprocessingconfigpmmapper/setup.sh
@@ -78,6 +78,18 @@ for i in {1..5}; do
 done
 [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
 
+#Data Router healthcheck
+for i in $(seq 10); do
+  curl -sf 'http://localhost:8080/internal/prov' -o /dev/null
+  curl_status=$?
+  if [ curl_status -eq 0 ]; then
+      break
+    else
+      sleep 2
+  fi
+done
+
+
 # Data Router Configuration.
 docker exec -i datarouter-prov sh -c \
     "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP"
diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml
index d612de2..ad671d2 100644
--- a/csit/plans/pmmapper/docker-compose.yml
+++ b/csit/plans/pmmapper/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - "dcae-pm-mapper:$PMMAPPER_IP"
 
   node:
-    image: node:10-slim
+    image: nexus3.onap.org:10001/node:10-slim
     container_name: mr-simulator
     volumes:
       - /var/tmp/mrserver.js:/tmp/mrserver.js
@@ -57,7 +57,7 @@ services:
         ipv4_address: $NODE_IP
 
   mariadb:
-    image: mariadb:10.2.14
+    image: nexus3.onap.org:10001/mariadb:10.2.14
     container_name: mariadb
     ports:
       - "3306:3306"
diff --git a/csit/plans/pmmapper/setup.sh b/csit/plans/pmmapper/setup.sh
index 918b7f6..258b99e 100644
--- a/csit/plans/pmmapper/setup.sh
+++ b/csit/plans/pmmapper/setup.sh
@@ -71,6 +71,17 @@ for i in {1..5}; do
 done
 [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
 
+#Data Router healthcheck
+for i in $(seq 10); do
+  curl -sf 'http://localhost:8080/internal/prov' -o /dev/null
+  curl_status=$?
+  if [ curl_status -eq 0 ]; then
+      break
+    else
+      sleep 2
+  fi
+done
+
 # Data Router Configuration.
 docker exec -i datarouter-prov sh -c \
     "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP"
-- 
cgit