Skip to content

Commit c1c56a2

Browse files
committed
Skip ACVP tests on Amazon Linux 2 containers
- Skip ACVP tests when Python on the container does not support hashlib sha512_224. - In previous commit, when adding several containers to ec2_compatibilitytests, we found that three Amazon Linux 2 containers could not run ACVP tests correctly due to missing support for newer hashlib hash types: * `amazonlinux-2-aarch:base` * `amazonlinux-2-aarch:gcc-7x` * `amazonlinux-2-aarch:clang-7x` - For these containers, we set `acvptest` to false. We also added a guard around `make quickcheck` in `ci_ec2_container.yml` and left a comment for future refinement. Signed-off-by: willieyz <willie.zhao@chelpis.com>
1 parent 20112a6 commit c1c56a2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,11 @@ jobs:
620620
matrix:
621621
container:
622622
- id: amazonlinux-2-aarch:base
623+
acvptest: false
623624
- id: amazonlinux-2-aarch:gcc-7x
625+
acvptest: false
624626
- id: amazonlinux-2-aarch:clang-7x
627+
acvptest: false
625628
- id: amazonlinux-2023-aarch:base
626629
- id: amazonlinux-2023-aarch:gcc-11x
627630
- id: amazonlinux-2023-aarch:clang-15x
@@ -654,7 +657,7 @@ jobs:
654657
opt: all
655658
functest: true
656659
kattest: true
657-
acvptest: true
660+
acvptest: ${{ matrix.container.acvptest != '' && matrix.container.acvptest || 'true' }}
658661
lint: false
659662
verbose: true
660663
cflags: "-O0"

.github/workflows/ci_ec2_container.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ jobs:
169169
with:
170170
sudo: ""
171171
- name: make quickcheck
172+
# TODO: refine quickcheck conditions.
173+
# For now, we run quickcheck only when all tests (func, kat, acvp, opt) are enabled.
174+
if: ${{ inputs.functest == 'true' && inputs.acvptest == 'true' && inputs.kattest == 'true' && inputs.opt == 'all' }}
172175
run: |
173176
OPT=0 make quickcheck
174177
make clean >/dev/null

0 commit comments

Comments
 (0)