diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2022-02-17 12:57:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-02-17 12:57:59 +0000 |
| commit | 6fe7a26007187510fad151dbbf8314c53787fe76 (patch) | |
| tree | 7aaab320941748a357457ca87c4ca605662a8547 /csit/distribution/plans | |
| parent | 461a8bd824c06f42c717e6db55ba5cbb8b280c46 (diff) | |
| parent | 7abe36cd557a9c2d5abebcf54a4ed5957a4168a1 (diff) | |
Merge "Add docker configuration for Prometheus and Grafana"
Diffstat (limited to 'csit/distribution/plans')
| -rw-r--r-- | csit/distribution/plans/setup.sh | 41 | ||||
| -rw-r--r-- | csit/distribution/plans/teardown.sh | 7 |
2 files changed, 25 insertions, 23 deletions
diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh index df0bdb1f..b7495007 100644 --- a/csit/distribution/plans/setup.sh +++ b/csit/distribution/plans/setup.sh @@ -1,10 +1,8 @@ #!/bin/bash # ============LICENSE_START======================================================= # Copyright (C) 2018 Ericsson. All rights reserved. -# -# Modifications copyright (c) 2019 Nordix Foundation. +# Modifications Copyright (c) 2019-2022 Nordix Foundation. # Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. -# Modification Copyright 2021. Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +18,6 @@ # # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -source ${SCRIPTS}/get-branch-mariadb.sh echo "Uninstall docker-py and reinstall docker." python3 -m pip uninstall -y docker-py @@ -29,37 +26,37 @@ python3 -m pip install -U docker sudo apt-get -y install libxml2-utils -source ${SCRIPTS}/detmVers.sh +source "${SCRIPTS}"/get-versions.sh SCRIPT_DIR=${TESTPLANDIR}/config # Remaking the csar file in case if the file got corrupted -zip -F ${SCRIPT_DIR}/csar/sample_csar_with_apex_policy.csar --out ${SCRIPT_DIR}/csar/csar_temp.csar +zip -F "${SCRIPT_DIR}"/csar/sample_csar_with_apex_policy.csar --out "${SCRIPT_DIR}"/csar/csar_temp.csar # Remake temp directory -rm -rf ${SCRIPT_DIR}/temp -mkdir ${SCRIPT_DIR}/temp +rm -rf "${SCRIPT_DIR}"/temp +mkdir "${SCRIPT_DIR}"/temp -docker-compose -f ${SCRIPTS}/docker-compose-all.yml up -d distribution +docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d distribution unset http_proxy https_proxy -POLICY_API_IP=`get-instance-ip.sh policy-api` -POLICY_PAP_IP=`get-instance-ip.sh policy-pap` -MARIADB_IP=`get-instance-ip.sh mariadb` -APEX_IP=`get-instance-ip.sh policy-apex-pdp` -DMAAP_IP=`get-instance-ip.sh simulator` -POLICY_DISTRIBUTION_IP=`get-instance-ip.sh policy-distribution` +POLICY_API_IP=$(get-instance-ip.sh policy-api) +POLICY_PAP_IP=$(get-instance-ip.sh policy-pap) +MARIADB_IP=$(get-instance-ip.sh mariadb) +APEX_IP=$(get-instance-ip.sh policy-apex-pdp) +DMAAP_IP=$(get-instance-ip.sh simulator) +POLICY_DISTRIBUTION_IP=$(get-instance-ip.sh policy-distribution) -echo PAP IP IS ${POLICY_PAP_IP} -echo MARIADB IP IS ${MARIADB_IP} -echo API IP IS ${POLICY_API_IP} -echo APEX IP IS ${APEX_IP} -echo DMAAP_IP IS ${DMAAP_IP} -echo POLICY_DISTRIBUTION_IP IS ${POLICY_DISTRIBUTION_IP} +echo PAP IP IS "${POLICY_PAP_IP}" +echo MARIADB IP IS "${MARIADB_IP}" +echo API IP IS "${POLICY_API_IP}" +echo APEX IP IS "${APEX_IP}" +echo DMAAP_IP IS "${DMAAP_IP}" +echo POLICY_DISTRIBUTION_IP IS "${POLICY_DISTRIBUTION_IP}" # wait for the app to start up -${SCRIPTS}/wait_for_port.sh ${POLICY_DISTRIBUTION_IP} 6969 +"${SCRIPTS}"/wait_for_port.sh "${POLICY_DISTRIBUTION_IP}" 6969 ROBOT_VARIABLES="" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v APEX_IP:${APEX_IP}" diff --git a/csit/distribution/plans/teardown.sh b/csit/distribution/plans/teardown.sh index f47fcd87..e451ba66 100644 --- a/csit/distribution/plans/teardown.sh +++ b/csit/distribution/plans/teardown.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2018 Ericsson. All rights reserved. # -# Modifications copyright (c) 2019 Nordix Foundation. +# Modifications copyright (c) 2019-2022 Nordix Foundation. # Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,4 +20,9 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= +docker logs policy-api +docker logs simulator +docker logs policy-pap +docker logs policy-distribution + docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v |