Merge pull request #10969 from Frauschi/ci_flakyness_fixes

CI: reduce flakiness in the libssh2, trackmemory, and socat jobs
pull/10989/head
Sean Parkinson 2026-07-24 10:41:54 +10:00 committed by GitHub
commit 00c9405c24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 12 deletions

View File

@ -90,7 +90,12 @@ jobs:
- name: Run libssh2 tests
working-directory: libssh2
run: make -j check
# The Docker OpenSSH-server tests hit a container-readiness race
# ("Failed getting banner"): the client connects before sshd in the
# freshly started container is ready to send its banner. Re-run only
# the tests that did not pass, so a transient race does not fail the
# job while a genuine failure still does.
run: make -j check || make recheck || make recheck
- name: Confirm libssh2 built with wolfSSL
run: ldd libssh2/src/.libs/libssh2.so | grep wolfssl

View File

@ -53,9 +53,9 @@ jobs:
matrix:
include:
- socat_version: "1.8.0.0"
expect_fail: "36,64,146,155,156,216,307,309,310,321,386,399,402,403,459,460,467,468,475,478,491,492,528,529"
expect_fail: "36,64,146,155,156,205,216,227,307,309,310,321,386,399,402,403,459,460,467,468,475,478,491,492,528,529"
- socat_version: "1.8.0.3"
expect_fail: "146,155,156,307,321,386,399,402,459,460,467,468,475,478,491,492,495,528,529"
expect_fail: "23,146,155,156,307,321,386,399,402,459,460,467,468,475,478,491,492,495,528,529"
steps:
- name: Checkout wolfSSL CI actions
uses: actions/checkout@v5

View File

@ -73,25 +73,25 @@ jobs:
run: |
cat > "$RUNNER_TEMP/trackmemory-configs.json" <<'EOF'
[
{"name": "all-noasm-wolfentropy", "minutes": 3,
{"name": "all-noasm-wolfentropy", "minutes": 6.3,
"configure": ["--disable-asm", "--enable-wolfEntropy",
"--enable-smallstackcache", "--enable-smallstack", "--enable-all",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"]},
{"name": "all-trace-errcodes", "minutes": 2.5,
"configure": ["--enable-all", "--enable-debug-trace-errcodes",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"]},
{"name": "all-smallstack", "minutes": 2.5,
"configure": ["--enable-smallstack", "--enable-all",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"]},
{"name": "all-smallstack-cache-trace", "minutes": 2.5,
{"name": "all-smallstack-cache-trace", "minutes": 4.1,
"configure": ["--enable-smallstackcache", "--enable-smallstack",
"--enable-all", "--enable-debug-trace-errcodes",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"]},
{"name": "all-wolfentropy", "minutes": 2.5,
{"name": "all-wolfentropy", "minutes": 4.1,
"comment": "smallstackcache coverage here is crucial for the Linux kernel module when targeting a kernel with the randomness patch (linuxkm/patches/) applied. Don't combine wolfEntropy with the full TLS cipher suite test - the implicit wc_InitRng()s in each suite have an enormous CPU footprint.",
"configure": ["--enable-wolfEntropy", "--enable-smallstackcache",
"--enable-smallstack", "--enable-all",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"]},
{"name": "all-trace-errcodes", "minutes": 3.9,
"configure": ["--enable-all", "--enable-debug-trace-errcodes",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"]},
{"name": "all-smallstack", "minutes": 3.9,
"configure": ["--enable-smallstack", "--enable-all",
"CFLAGS=-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"]},
{"name": "all-intelrdseed", "minutes": 2.5,
"configure": ["--enable-intelrdseed", "--enable-smallstackcache",
"--enable-smallstack", "--enable-all",