diff --git a/.github/docker_images/alpine-linux/Dockerfile b/.github/docker_images/alpine-linux/Dockerfile index 74670de69f..7011c494bd 100644 --- 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"] \ No newline at end of file +ENTRYPOINT ["/bin/bash", "-c"] diff --git a/.github/docker_images/alpine-linux/entry.sh b/.github/docker_images/alpine-linux/entry.sh deleted file mode 100755 index 855a264dae..0000000000 --- a/.github/docker_images/alpine-linux/entry.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 OR ISC - -set -ex -o pipefail - -CHECK_FIPS="$1" - -if [[ "${CHECK_FIPS}" == "0" ]]; then - echo "Testing AWS-LC Non-FIPS" - tests/ci/run_posix_tests.sh -elif [[ "${CHECK_FIPS}" == "1" ]]; then - echo "Testing AWS-LC FIPS" - tests/ci/run_fips_tests.sh -else - exit 1 -fi diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml index b883787e60..6b81bd6043 100644 --- 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: