Merge pull request #126 from glimchb/ci

ci: add tacklebox validation to ci
DMTF · Apr 19, 2024 · 869ae70 · 869ae70
2 parents 8da867e + d87fd7c
commit 869ae70
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -10,26 +10,18 @@ jobs:
       - uses: docker/setup-buildx-action@v3.0.0
       - name: Start containers
         run: docker-compose up --build --force-recreate --detach
-      - name: Verify no-ssl success
+      - name: Verify all tests completed successfully
         run: |
           set -x
-          name=$(docker-compose ps | grep test | grep -v ssl | awk '{print $1}')
-          rc=$(docker wait "${name}")
-          if [ "${rc}" != "0" ]; then
-              echo "test failed:"
-              docker logs "${name}"
-              exit 1
-          fi
-      - name: Verify ssl success
-        run: |
-          set -x
-          name=$(docker-compose ps | grep test-ssl | awk '{print $1}')
-          rc=$(docker wait "${name}")
-          if [ "${rc}" != "0" ]; then
-              echo "test-ssl failed:"
-              docker logs "${name}"
-              exit 1
-          fi
+          for testname in test-curl-nossl test-curl-ssl test-utils-nossl test-utils-ssl; do
+            name=$(docker-compose ps | grep ${testname} | awk '{print $1}')
+            rc=$(docker wait "${name}")
+            if [ "${rc}" != "0" ]; then
+                echo "test failed:"
+                docker logs "${name}"
+                exit 1
+            fi
+          done
       - name: Logs
         if: always()
         run: docker-compose logs

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     networks:
       - dmtf
 
-  test:
+  test-curl-nossl:
     image: docker.io/curlimages/curl:8.5.0
     depends_on:
       bmc:
@@ -21,7 +21,7 @@ services:
       - dmtf
     command: ["--fail", "-i", "-H", "Accept:application/yang-data+json", "http://bmc:8000/redfish/v1/Managers"]
 
-  test-utils:
+  test-utils-nossl:
     image: docker.io/dmtf/redfish-tacklebox:latest
     depends_on:
       bmc:
@@ -59,7 +59,7 @@ services:
     healthcheck:
       test: curl --insecure --fail https://localhost:9000/redfish/
 
-  test-ssl:
+  test-curl-ssl:
     image: docker.io/curlimages/curl:8.5.0
     depends_on:
       bmc-ssl: