parameterize tests into docker run command

aws · Aug 9, 2024 · 26f2d99 · 26f2d99
1 parent 8ce6856
commit 26f2d99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/.github/docker_images/alpine-linux/Dockerfile b/.github/docker_images/alpine-linux/Dockerfile
@@ -22,6 +22,4 @@ WORKDIR /awslc
 ENV CC=${CC}
 ENV CXX=${CXX}
 
-COPY entry.sh /
-
-ENTRYPOINT ["/entry.sh"]
+ENTRYPOINT ["/bin/bash", "-c"]
diff --git a/.github/docker_images/alpine-linux/entry.sh b/.github/docker_images/alpine-linux/entry.sh
diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml
@@ -467,7 +467,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fips: [0, 1]
+        tests: [
+          /awslc/tests/ci/run_fips_tests.sh,
+          /awslc/tests/ci/run_posix_tests.sh
+        ]
         compiler: [
           --build-arg CC=clang --build-arg CXX=clang++,
           --build-arg CC=gcc --build-arg CXX=g++
@@ -484,7 +487,7 @@ jobs:
       - name: Run tests
         run: |
           docker run -v "${{ github.workspace }}:/awslc" \
-          alpine_linux ${{ matrix.fips }}
+          alpine_linux ${{ matrix.tests }}
 
     # TODO: Investigate sudden hanging tests and failures in GHA runners (P114059413)
 #  MSVC-SDE-32-bit: