aboutsummaryrefslogtreecommitdiffstats
path: root/csit/scripts/sdnr/docker-compose
diff options
context:
space:
mode:
authordemskeq8 <alexander.dehn@highstreet-technologies.com>2023-09-04 17:59:57 +0200
committerdemskeq8 <alexander.dehn@highstreet-technologies.com>2023-09-08 13:17:12 +0200
commit5f9f3ccf917d91e2af7f29a467a451d6274912a7 (patch)
tree317766a771fa6e74dc549cdbce7c7affa97586d7 /csit/scripts/sdnr/docker-compose
parent8fc94e40c76df15d369300ba70267ab1f844f3c1 (diff)
[CSIT] update SDNR tests for mariaDB based sdnrdb
update SDNC test image deploy sdnc-web-image for sdnr test setup add healthcheck add basic odlux tests Issue-ID: SDNC-1820 Change-Id: Ib89d097f301bfe4803bf3006549bee9a78fb6c19 Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>
Diffstat (limited to 'csit/scripts/sdnr/docker-compose')
-rw-r--r--csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml19
-rwxr-xr-xcsit/scripts/sdnr/docker-compose/wait-for-sdnc.sh30
2 files changed, 30 insertions, 19 deletions
diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml
index 5f3e8819..0f547e8f 100644
--- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml
@@ -3,22 +3,6 @@ services:
sdnr:
environment:
- SDNRDM="true"
- topology-api:
- image: ${TOPOLOGY_DOCKER_REPO}/${TOPOLOGY_DOCKER_IMAGE_NAME}:${TOPOLOGY_DOCKER_IMAGE_TAG}
- container_name: topology-api
- ports:
- - "3001:3001"
- environment:
- - AUTH_ENABLED=${AUTH_ENABLED}
- - AUTH_HOST_URL=${IDENTITY_PROVIDER_URL}
- # - AUTH_CONFIG_FILE
- - PROVIDERS=${TOPOLOGY_PROVIDERS}
- - LOAD_PACKAGES=${LOAD_PACKAGES}
- depends_on:
- - sdnr
- networks:
- integration:
- ipv4_address: ${TOPOLOGY_IP}
sdnr-web:
image: ${NEXUS_DOCKER_WEB_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG}
container_name: sdnr-web
@@ -30,10 +14,7 @@ services:
- SDNRPROTOCOL=HTTP
- SDNRHOST=sdnr
- SDNRPORT=${SDNRPORT}
- - TOPOURL=${TOPOURL}
- - TILEURL=${TILEURL}
depends_on:
- - topology-api
- sdnr
command: ["/wait-for-sdnc.sh", "sdnr:${SDNRPORT}/ready", "/opt/bitnami/nginx/sbin/run.sh"]
volumes:
diff --git a/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh b/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh
new file mode 100755
index 00000000..26302622
--- /dev/null
+++ b/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# wait-for-sdnc.sh
+# *******************************************************************************
+# * ============LICENSE_START========================================================================
+# * Copyright (C) 2023 highstreet technologies GmbH Intellectual Property. All rights reserved.
+# * =================================================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# * in compliance with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License
+# * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# * or implied. See the License for the specific language governing permissions and limitations under
+# * the License.
+# * ============LICENSE_END==========================================================================
+set -e
+
+url="$1"
+shift
+cmd="$@"
+
+while [ "$(curl -s -o /dev/null -w ''%{http_code}'' $url)" != "200" ]; do
+ >&2 echo "sdnc is not ready - sleeping"
+ sleep 1
+done
+
+>&2 echo "sdnc is up - executing command"
+exec $cmd
+