Updated sls app version in docker compose for the ct tests

- Updated the sls app version to 2.4.0 for the test config
- Changed docker-compose to docker compose in the test scripts

CASMHMS-6237

docker-compose.test.ct.yaml

@@ -78,7 +78,7 @@ services:
     networks:
       - smd
   cray-sls-init:
-    image: artifactory.algol60.net/csm-docker/stable/cray-sls:2.3.0
+    image: artifactory.algol60.net/csm-docker/stable/cray-sls:2.4.0
     command: ["sls-init"]
     environment:
       - POSTGRES_HOST=sls-postgres
@@ -89,7 +89,7 @@ services:
     networks:
       - smd
   cray-sls:
-    image: artifactory.algol60.net/csm-docker/stable/cray-sls:2.3.0
+    image: artifactory.algol60.net/csm-docker/stable/cray-sls:2.4.0
     environment:
       - POSTGRES_HOST=cray-sls-postgres
       - DBOPTS=sslmode=disable
@@ -304,4 +304,4 @@ services:
     networks:
       smd:
         aliases:
-          - x0c0s4b0
+          - x0c0s4b0

runCT.sh

@@ -3,7 +3,7 @@
 #
 # MIT License
 #
-# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,7 +34,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 function cleanup() {
   echo "Cleaning up containers..."
-  docker-compose down
+  docker compose down
   if ! [[ $? -eq 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -44,16 +44,16 @@ function cleanup() {
 
 # Get the base containers running
 echo "Starting containers..."
-docker-compose build --no-cache
-docker-compose up --exit-code-from wait-for-smd wait-for-smd
-docker-compose up --exit-code-from smoke-tests smoke-tests
+docker compose build --no-cache
+docker compose up --exit-code-from wait-for-smd wait-for-smd
+docker compose up --exit-code-from smoke-tests smoke-tests
 test_result=$?
 if [[ $test_result -ne 0 ]]; then
   echo "CT smoke tests FAILED!"
   cleanup 1
 fi
 
-docker-compose up --exit-code-from tavern-tests tavern-tests
+docker compose up --exit-code-from tavern-tests tavern-tests
 test_result=$?
 if [[ $test_result -ne 0 ]]; then
   echo "CT tavern tests FAILED!"
@@ -62,4 +62,4 @@ fi
 
 # Cleanup
 echo "CT tests PASSED!"
-cleanup 0
+cleanup 0

runUnitTest.sh

@@ -2,7 +2,7 @@
 
 # MIT License
 #
-# (C) Copyright [2021-2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2021-2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -33,7 +33,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 
 function cleanup() {
-  docker-compose down
+  docker compose down
   if ! [[ $? -eq 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -43,8 +43,8 @@ function cleanup() {
 
 
 echo "Starting containers..."
-docker-compose build --no-cache
-docker-compose up --exit-code-from unit-tests unit-tests
+docker compose build --no-cache
+docker compose up --exit-code-from unit-tests unit-tests
 
 test_result=$?