From 6497ad58588492901838654a36445ad90497ef61 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 30 Jun 2023 21:48:29 +0200
Subject: [PATCH] Reorganize runchecker jobs

Put jobs that are more likely to fail to on pull request CI.
To compensate move some less likely to fail jobs to on push and
daily CI jobs.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/21336)
---
 .github/workflows/run-checker-ci.yml    |  9 +++------
 .github/workflows/run-checker-daily.yml |  7 ++-----
 .github/workflows/run-checker-merge.yml | 10 +++++++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index a44121fdf26..d56b0202f74 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -19,18 +19,16 @@ jobs:
         opt: [
           no-cmp,
           no-cms,
-          no-ct,
+          no-dgram,
+          no-dh,
           no-dtls,
           no-ec,
           no-ec2m,
+          no-ecx,
           no-http,
-          no-siv,
           no-legacy,
           no-sock,
-          no-srp,
-          no-srtp,
           enable-ssl-trace,
-          no-tests,
           no-threads,
           no-thread-pool,
           no-default-thread-pool,
@@ -38,7 +36,6 @@ jobs:
           no-tls1_2,
           no-tls1_3,
           enable-trace enable-fips,
-          no-ts,
           no-ui,
         ]
     runs-on: ubuntu-latest
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index d97f3f2ee01..45b97f21cd5 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -48,7 +48,6 @@ jobs:
           no-deprecated,
           no-des,
           no-devcryptoeng,
-          no-dh,
           no-docs,
           no-dsa,
           no-dtls1,
@@ -79,15 +78,12 @@ jobs:
           no-md2,
           no-md4,
           no-mdc2,
-          no-module,
           no-msan,
           no-multiblock,
           no-nextprotoneg,
           no-ocb,
-          no-ocsp,
           no-padlockeng,
           no-pic,
-          no-pinshared,
           no-poly1305,
           no-posix-io,
           no-psk,
@@ -116,16 +112,17 @@ jobs:
           no-ssl-trace,
           no-static-engine no-shared,
           no-stdio,
+          no-tests,
           enable-tfo,
           no-tls1,
           no-tls1_1,
           no-tls1_1-method,
-          no-tls1_2,
           no-tls1_2-method,
           no-tls1-method,
           no-trace,
           no-ubsan,
           no-ui-console,
+          no-unit-test,
           enable-unit-test,
           no-uplink,
           no-weak-ssl-ciphers,
diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index 779dfd390e4..f79a59e0a6a 100644
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -19,17 +19,21 @@ jobs:
       matrix:
         opt: [
           enable-asan enable-ubsan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT,
-          no-dgram,
+          no-ct,
           no-dso,
           no-dynamic-engine,
           no-engine no-shared,
           no-err,
           no-filenames,
           enable-ubsan no-asm -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment,
-          no-unit-test,
+          no-module,
+          no-ocsp,
+          no-pinshared,
+          no-srp,
+          no-srtp,
+          no-ts,
           enable-weak-ssl-ciphers,
           enable-zlib,
-          no-ecx,
         ]
     runs-on: ubuntu-latest
     steps:
-- 
2.47.2