diff options
| author |   ecaiyanlinux <martin.c.yan@est.tech> | 2021-09-02 12:21:00 +0200 |
|---|---|---|
| committer | ecaiyanlinux <martin.c.yan@est.tech> | 2021-09-02 15:09:36 +0200 |
| commit | 9002c53de67fd594efbf8f66f3b0706ad9a9bec2 (patch) | |
| tree | c8ae82b69c039d02542b43ccb749e13e688bdb82 /csit/scripts/healthcheck/test | |
| parent | 2d34af551ed404a43afdfebb63b2a1b426722071 (diff) | |
Improvement & Enhancement of csit tests
Improve integration with sdnc
Use env variables to replace image urls & tags
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-ID: CCSDK-3433
Change-Id: Id6d6e428e5ddba018b50710710d077613d02b2e8
Diffstat (limited to 'csit/scripts/healthcheck/test')
| -rwxr-xr-x | csit/scripts/healthcheck/test/health_check.sh | 4 | ||||
| -rwxr-xr-x | csit/scripts/healthcheck/test/pms_a1sim.sh | 4 | ||||
| -rwxr-xr-x | csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/csit/scripts/healthcheck/test/health_check.sh b/csit/scripts/healthcheck/test/health_check.sh index 409e85fb..e08cc3e8 100755 --- a/csit/scripts/healthcheck/test/health_check.sh +++ b/csit/scripts/healthcheck/test/health_check.sh @@ -29,9 +29,9 @@ cp application_configuration.json.nosdnc application_configuration.json cd ${SHELL_FOLDER}/../ # start NONRTRIC containers with docker compose and configuration from docker-compose.yml -curl -L https://github.com/docker/compose/releases/download/1.27.0/docker-compose-`uname -s`-`uname -m` > docker-compose +curl -L https://github.com/docker/compose/releases/download/1.29.0/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose -./docker-compose up -d +./docker-compose --env-file .env up -d checkStatus(){ diff --git a/csit/scripts/healthcheck/test/pms_a1sim.sh b/csit/scripts/healthcheck/test/pms_a1sim.sh index fadc056b..b28cc02c 100755 --- a/csit/scripts/healthcheck/test/pms_a1sim.sh +++ b/csit/scripts/healthcheck/test/pms_a1sim.sh @@ -25,7 +25,9 @@ cd ${SHELL_FOLDER}/../config cp application_configuration.json.nosdnc application_configuration.json cd ${SHELL_FOLDER}/../ -docker-compose up -d +curl -L https://github.com/docker/compose/releases/download/1.29.0/docker-compose-`uname -s`-`uname -m` > docker-compose +chmod +x docker-compose +./docker-compose --env-file .env up -d checkStatus(){ for i in {1..60}; do diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh index c75d6056..c80e68a9 100755 --- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh +++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh @@ -26,7 +26,10 @@ cd ${SHELL_FOLDER}/../config cp application_configuration.json.sdnc application_configuration.json cd ${SHELL_FOLDER}/../ -docker-compose -f docker-compose.yml -f sdnc/docker-compose.yml up -d + +curl -L https://github.com/docker/compose/releases/download/1.29.0/docker-compose-`uname -s`-`uname -m` > docker-compose +chmod +x docker-compose +./docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml up -d checkStatus(){ for i in {1..60}; do |