Skip to content

Commit af19d17

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 66527cf commit af19d17

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,24 +620,45 @@ jobs:
620620
matrix:
621621
container:
622622
- id: amazonlinux-2-aarch:base
623+
# TODO: Python 3.7 on Amazon Linux 2 lacks `sha512_224` in hashlib; set to false to skip acvp.
624+
acvptest: false
623625
- id: amazonlinux-2-aarch:gcc-7x
626+
# TODO: Python 3.7 on Amazon Linux 2 lacks `sha512_224` in hashlib; set to false to skip acvp.
627+
acvptest: false
624628
- id: amazonlinux-2-aarch:clang-7x
629+
# TODO: Python 3.7 on Amazon Linux 2 lacks `sha512_224` in hashlib; set to false to skip acvp.
630+
acvptest: false
625631
- id: amazonlinux-2023-aarch:base
632+
acvptest: true
626633
- id: amazonlinux-2023-aarch:gcc-11x
634+
acvptest: true
627635
- id: amazonlinux-2023-aarch:clang-15x
636+
acvptest: true
628637
- id: amazonlinux-2023-aarch:clang-15x-sanitizer
638+
acvptest: true
629639
# - id: amazonlinux-2023-aarch:cryptofuzz Not yet supported
630640
- id: ubuntu-22.04-aarch:gcc-12x
641+
acvptest: true
631642
- id: ubuntu-22.04-aarch:gcc-11x
643+
acvptest: true
632644
- id: ubuntu-20.04-aarch:gcc-8x
645+
acvptest: true
633646
- id: ubuntu-20.04-aarch:gcc-7x
647+
acvptest: true
634648
- id: ubuntu-20.04-aarch:clang-9x
649+
acvptest: true
635650
- id: ubuntu-20.04-aarch:clang-8x
651+
acvptest: true
636652
- id: ubuntu-20.04-aarch:clang-7x-bm-framework
653+
acvptest: true
637654
- id: ubuntu-20.04-aarch:clang-7x
655+
acvptest: true
638656
- id: ubuntu-20.04-aarch:clang-10x
657+
acvptest: true
639658
- id: ubuntu-22.04-aarch:base
659+
acvptest: true
640660
- id: ubuntu-20.04-aarch:base
661+
acvptest: true
641662
name: Compatibility tests (${{ matrix.container.id }})
642663
permissions:
643664
contents: 'read'
@@ -654,7 +675,7 @@ jobs:
654675
opt: all
655676
functest: true
656677
kattest: true
657-
acvptest: true
678+
acvptest: ${{ matrix.container.acvptest }}
658679
lint: false
659680
verbose: true
660681
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)