Skip to content

Commit d8c75cd

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 a783d7d commit d8c75cd

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,24 +620,42 @@ 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
629+
acvptest: true
626630
- id: amazonlinux-2023-aarch:gcc-11x
631+
acvptest: true
627632
- id: amazonlinux-2023-aarch:clang-15x
633+
acvptest: true
628634
- id: amazonlinux-2023-aarch:clang-15x-sanitizer
635+
acvptest: true
629636
# - id: amazonlinux-2023-aarch:cryptofuzz Not yet supported
630637
- id: ubuntu-22.04-aarch:gcc-12x
638+
acvptest: true
631639
- id: ubuntu-22.04-aarch:gcc-11x
640+
acvptest: true
632641
- id: ubuntu-20.04-aarch:gcc-8x
642+
acvptest: true
633643
- id: ubuntu-20.04-aarch:gcc-7x
644+
acvptest: true
634645
- id: ubuntu-20.04-aarch:clang-9x
646+
acvptest: true
635647
- id: ubuntu-20.04-aarch:clang-8x
648+
acvptest: true
636649
- id: ubuntu-20.04-aarch:clang-7x-bm-framework
650+
acvptest: true
637651
- id: ubuntu-20.04-aarch:clang-7x
652+
acvptest: true
638653
- id: ubuntu-20.04-aarch:clang-10x
654+
acvptest: true
639655
- id: ubuntu-22.04-aarch:base
656+
acvptest: true
640657
- id: ubuntu-20.04-aarch:base
658+
acvptest: true
641659
name: Compatibility tests (${{ matrix.container.id }})
642660
permissions:
643661
contents: 'read'
@@ -654,7 +672,7 @@ jobs:
654672
opt: all
655673
functest: true
656674
kattest: true
657-
acvptest: true
675+
acvptest: ${{ matrix.container.acvptest != false }}
658676
lint: false
659677
verbose: true
660678
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 && inputs.acvptest && inputs.kattest && inputs.opt == 'all' }}
172175
run: |
173176
OPT=0 make quickcheck
174177
make clean >/dev/null

0 commit comments

Comments
 (0)