Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: update integ dependencies #4261

Merged
merged 5 commits into from
Nov 7, 2023
Merged

ci: update integ dependencies #4261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a82ea1
update integ dependencies
jmayclin Oct 16, 2023
0ca97e2
lower durations print
jmayclin Oct 24, 2023
2621567
Merge branch 'main' into timing-integ
jmayclin Oct 25, 2023
6d252ff
Merge branch 'main' into timing-integ
jmayclin Nov 6, 2023
f367926
Merge branch 'main' into timing-integ
jmayclin Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion codebuild/bin/criterion_baseline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ source codebuild/bin/utils.sh
# Disable PQ
export S2N_NO_PQ=1
# Limit the number of child processes in the test run
export XDIST_WORKERS=2
export RUST_BACKTRACE=1
export TOX_TEST_NAME="$INTEGV2_TEST"

Expand Down
1 change: 0 additions & 1 deletion codebuild/bin/criterion_delta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ source ./codebuild/bin/utils.sh
export S2N_NO_PQ=1
export AWS_S3_BUCKET="s3://s2n-tls-logs/"
# Limit the number of child processes in the test run
export XDIST_WORKERS=4
export RUST_BACKTRACE=1

export GIT_COMMIT=$(git log -n 1 --format="%h")
Expand Down
2 changes: 0 additions & 2 deletions codebuild/spec/buildspec_ubuntu_integv2criterion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ batch:
S2N_NO_PQ: 1
TESTS: integrationv2crit
GCC_VERSION: 6
XDIST_WORKERS: 2
RUST_BACKTRACE: 1
- identifier: s2nIntegrationv2WellKnownEndpoints
debug-session: true
Expand All @@ -33,7 +32,6 @@ batch:
S2N_NO_PQ: 1
TESTS: integrationv2crit
GCC_VERSION: 6
XDIST_WORKERS: 2
ARTIFACT_BUCKET: s3://s2n-tls-logs/release
ARTIFACT_FILE: integv2criterion
depend-on:
Expand Down
18 changes: 13 additions & 5 deletions tests/integrationv2/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,21 @@ setenv = S2N_INTEG_TEST = 1
passenv = DYLD_LIBRARY_PATH, LD_LIBRARY_PATH, OQS_OPENSSL_1_1_1_INSTALL_DIR, HOME, TOX_TEST_NAME
ignore_errors=False
deps =
pep8
pytest==5.3.5
pytest-xdist==1.34.0
sslyze==5.0.2
pytest==7
pytest-xdist==3.3
sslyze==5
pytest-rerunfailures
# -x : exit on first failure
# -n 2 : run with two worker processes, don't use higher until https://github.com/aws/s2n-tls/issues/2469 is addressed
# -rpfsq : print a (r)eport with (p)assed tests, (f)ailed tests, and (s)kipped tests
# --durations=10 : print the 10 slowest tests
commands =
pytest -x -n={env:XDIST_WORKERS:"2"} --maxfail=1 --reruns=2 --cache-clear -rpfsq \
pytest -x \
-n=2 \
--reruns=2 \
--cache-clear \
-rpfsq \
--durations=10 \
-o log_cli=true --log-cli-level=INFO \
--provider-version={env:S2N_LIBCRYPTO} \
--provider-criterion={env:S2N_USE_CRITERION:"off"} \
Expand Down