Skip to content

Commit 03c3d04

Browse files
addressing comments
Signed-off-by: Sarthak Aggarwal <[email protected]>
1 parent 64492fe commit 03c3d04

File tree

2 files changed

+59
-86
lines changed

2 files changed

+59
-86
lines changed

.github/workflows/daily.yml

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: Daily
2-
32
on:
43
pull_request:
54
branches:
@@ -32,14 +31,43 @@ on:
3231
use_git_ref:
3332
description: "git branch or sha to use"
3433
default: "unstable"
35-
34+
workflow_call:
35+
inputs:
36+
skipjobs:
37+
description: "jobs to skip (delete the ones you wanna keep, do not leave empty)"
38+
required: false
39+
type: string
40+
default: "valgrind,sanitizer,tls,freebsd,macos,alpine,32bit,iothreads,ubuntu,rpm-distros,malloc,specific,fortify,reply-schema,arm,lttng"
41+
skiptests:
42+
description: "tests to skip (delete the ones you wanna keep, do not leave empty)"
43+
required: false
44+
type: string
45+
default: "valkey,modules,sentinel,cluster,unittest,large-memory"
46+
test_args:
47+
description: "extra test arguments"
48+
required: false
49+
type: string
50+
default: ""
51+
cluster_test_args:
52+
description: "extra cluster / sentinel test arguments"
53+
required: false
54+
type: string
55+
default: ""
56+
use_repo:
57+
description: "repo owner and name"
58+
required: false
59+
type: string
60+
default: "valkey-io/valkey"
61+
use_git_ref:
62+
description: "git branch or sha to use"
63+
required: false
64+
type: string
65+
default: "unstable"
3666
concurrency:
37-
group: daily-${{ github.head_ref || github.ref }}
67+
group: daily-${{ github.head_ref || github.event.inputs.use_git_ref || github.ref }}
3868
cancel-in-progress: true
39-
4069
permissions:
4170
contents: read
42-
4371
jobs:
4472
test-ubuntu-jemalloc:
4573
runs-on: ubuntu-latest
@@ -108,7 +136,6 @@ jobs:
108136
run: |
109137
sudo apt-get install tcl8.6 tclx
110138
./runtest --verbose --tags compatible-redis --dump-logs --other-server-path tests/tmp/redis-7.0.15/src/redis-server
111-
112139
test-ubuntu-arm:
113140
runs-on: ubuntu-24.04-arm
114141
if: |
@@ -150,7 +177,6 @@ jobs:
150177
- name: unittest
151178
if: true && !contains(github.event.inputs.skiptests, 'unittest')
152179
run: ./src/valkey-unit-tests --accurate
153-
154180
test-ubuntu-jemalloc-fortify:
155181
runs-on: ubuntu-latest
156182
if: |
@@ -196,7 +222,6 @@ jobs:
196222
- name: unittest
197223
if: true && !contains(github.event.inputs.skiptests, 'unittest')
198224
run: ./src/valkey-unit-tests --accurate
199-
200225
test-ubuntu-libc-malloc:
201226
runs-on: ubuntu-latest
202227
if: |
@@ -235,7 +260,6 @@ jobs:
235260
- name: cluster tests
236261
if: true && !contains(github.event.inputs.skiptests, 'cluster')
237262
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
238-
239263
test-ubuntu-no-malloc-usable-size:
240264
runs-on: ubuntu-latest
241265
if: |
@@ -274,7 +298,6 @@ jobs:
274298
- name: cluster tests
275299
if: true && !contains(github.event.inputs.skiptests, 'cluster')
276300
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
277-
278301
test-ubuntu-32bit:
279302
runs-on: ubuntu-latest
280303
if: |
@@ -320,7 +343,6 @@ jobs:
320343
- name: unittest
321344
if: true && !contains(github.event.inputs.skiptests, 'unittest')
322345
run: ./src/valkey-unit-tests --accurate
323-
324346
test-ubuntu-tls:
325347
runs-on: ubuntu-latest
326348
if: |
@@ -366,7 +388,6 @@ jobs:
366388
if: true && !contains(github.event.inputs.skiptests, 'cluster')
367389
run: |
368390
./runtest-cluster --tls ${{github.event.inputs.cluster_test_args}}
369-
370391
test-ubuntu-tls-no-tls:
371392
runs-on: ubuntu-latest
372393
if: |
@@ -412,7 +433,6 @@ jobs:
412433
if: true && !contains(github.event.inputs.skiptests, 'cluster')
413434
run: |
414435
./runtest-cluster ${{github.event.inputs.cluster_test_args}}
415-
416436
test-ubuntu-io-threads:
417437
runs-on: ubuntu-latest
418438
if: |
@@ -446,7 +466,6 @@ jobs:
446466
- name: cluster tests
447467
if: true && !contains(github.event.inputs.skiptests, 'cluster')
448468
run: ./runtest-cluster --io-threads ${{github.event.inputs.cluster_test_args}}
449-
450469
test-ubuntu-tls-io-threads:
451470
runs-on: ubuntu-latest
452471
if: |
@@ -484,7 +503,6 @@ jobs:
484503
if: true && !contains(github.event.inputs.skiptests, 'cluster')
485504
run: |
486505
./runtest-cluster --io-threads --tls ${{github.event.inputs.cluster_test_args}}
487-
488506
test-ubuntu-reclaim-cache:
489507
runs-on: ubuntu-latest
490508
if: |
@@ -560,7 +578,6 @@ jobs:
560578
CACHE=$(grep -w file /sys/fs/cgroup/memory.stat | awk '{print $2}')
561579
echo "$CACHE"
562580
if [ "$(( $CACHE-$CACHE0 ))" -gt "8000000" ]; then exit 1; fi
563-
564581
test-valgrind-test:
565582
runs-on: ubuntu-latest
566583
if: |
@@ -592,7 +609,6 @@ jobs:
592609
- name: test
593610
if: true && !contains(github.event.inputs.skiptests, 'valkey')
594611
run: ./runtest --valgrind --no-latency --verbose --clients 1 --timeout 2400 --dump-logs ${{github.event.inputs.test_args}}
595-
596612
test-valgrind-misc:
597613
runs-on: ubuntu-latest
598614
if: |
@@ -629,7 +645,6 @@ jobs:
629645
run: |
630646
valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-unit-tests --valgrind
631647
if grep -q 0x err.txt; then cat err.txt; exit 1; fi
632-
633648
test-valgrind-no-malloc-usable-size-test:
634649
runs-on: ubuntu-latest
635650
if: |
@@ -661,7 +676,6 @@ jobs:
661676
- name: test
662677
if: true && !contains(github.event.inputs.skiptests, 'valkey')
663678
run: ./runtest --valgrind --no-latency --verbose --clients 1 --timeout 2400 --dump-logs ${{github.event.inputs.test_args}}
664-
665679
test-valgrind-no-malloc-usable-size-misc:
666680
runs-on: ubuntu-latest
667681
if: |
@@ -698,7 +712,6 @@ jobs:
698712
run: |
699713
valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-unit-tests --valgrind
700714
if grep -q 0x err.txt; then cat err.txt; exit 1; fi
701-
702715
test-sanitizer-address:
703716
runs-on: ubuntu-latest
704717
if: |
@@ -754,7 +767,6 @@ jobs:
754767
- name: large memory module api tests
755768
if: true && !contains(github.event.inputs.skiptests, 'modules') && !contains(github.event.inputs.skiptests, 'large-memory')
756769
run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs --large-memory --tags large-memory ${{github.event.inputs.test_args}}
757-
758770
test-sanitizer-undefined:
759771
runs-on: ubuntu-latest
760772
if: |
@@ -810,7 +822,6 @@ jobs:
810822
- name: large memory module api tests
811823
if: true && !contains(github.event.inputs.skiptests, 'modules') && !contains(github.event.inputs.skiptests, 'large-memory')
812824
run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs --large-memory --tags large-memory ${{github.event.inputs.test_args}}
813-
814825
test-sanitizer-force-defrag:
815826
runs-on: ubuntu-latest
816827
if: |
@@ -856,7 +867,6 @@ jobs:
856867
- name: unittest
857868
if: true && !contains(github.event.inputs.skiptests, 'unittest')
858869
run: ./src/valkey-unit-tests
859-
860870
test-ubuntu-lttng:
861871
runs-on: ubuntu-latest
862872
if: |
@@ -897,7 +907,6 @@ jobs:
897907
- name: cluster tests
898908
if: true && !contains(github.event.inputs.skiptests, 'cluster')
899909
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
900-
901910
test-rpm-distros-jemalloc:
902911
if: |
903912
(github.event_name == 'workflow_dispatch' ||
@@ -921,13 +930,10 @@ jobs:
921930
container: fedora:latest
922931
- name: test-fedorarawhide-jemalloc
923932
container: fedora:rawhide
924-
925933
name: ${{ matrix.name }}
926934
runs-on: ubuntu-latest
927-
928935
container: ${{ matrix.container }}
929936
timeout-minutes: 1440
930-
931937
steps:
932938
- name: prep
933939
if: github.event_name == 'workflow_dispatch'
@@ -963,7 +969,6 @@ jobs:
963969
- name: cluster tests
964970
if: true && !contains(github.event.inputs.skiptests, 'cluster')
965971
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
966-
967972
test-rpm-distros-tls-module:
968973
if: |
969974
(github.event_name == 'workflow_dispatch' ||
@@ -987,13 +992,10 @@ jobs:
987992
container: fedora:latest
988993
- name: test-fedorarawhide-tls-module
989994
container: fedora:rawhide
990-
991995
name: ${{ matrix.name }}
992996
runs-on: ubuntu-latest
993-
994997
container: ${{ matrix.container }}
995998
timeout-minutes: 1440
996-
997999
steps:
9981000
- name: prep
9991001
if: github.event_name == 'workflow_dispatch'
@@ -1035,7 +1037,6 @@ jobs:
10351037
if: true && !contains(github.event.inputs.skiptests, 'cluster')
10361038
run: |
10371039
./runtest-cluster --tls-module ${{github.event.inputs.cluster_test_args}}
1038-
10391040
test-rpm-distros-tls-module-no-tls:
10401041
if: |
10411042
(github.event_name == 'workflow_dispatch' ||
@@ -1059,13 +1060,10 @@ jobs:
10591060
container: fedora:latest
10601061
- name: test-fedorarawhide-tls-module-no-tls
10611062
container: fedora:rawhide
1062-
10631063
name: ${{ matrix.name }}
10641064
runs-on: ubuntu-latest
1065-
10661065
container: ${{ matrix.container }}
10671066
timeout-minutes: 1440
1068-
10691067
steps:
10701068
- name: prep
10711069
if: github.event_name == 'workflow_dispatch'
@@ -1107,7 +1105,6 @@ jobs:
11071105
if: true && !contains(github.event.inputs.skiptests, 'cluster')
11081106
run: |
11091107
./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1110-
11111108
test-macos-latest:
11121109
runs-on: macos-latest
11131110
if: |
@@ -1138,7 +1135,6 @@ jobs:
11381135
- name: module api test
11391136
if: true && !contains(github.event.inputs.skiptests, 'modules')
11401137
run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --clients 1 --no-latency --dump-logs ${{github.event.inputs.test_args}}
1141-
11421138
test-macos-latest-sentinel:
11431139
runs-on: macos-latest
11441140
if: |
@@ -1166,7 +1162,6 @@ jobs:
11661162
- name: sentinel tests
11671163
if: true && !contains(github.event.inputs.skiptests, 'sentinel')
11681164
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
1169-
11701165
test-macos-latest-cluster:
11711166
runs-on: macos-latest
11721167
if: |
@@ -1194,7 +1189,6 @@ jobs:
11941189
- name: cluster tests
11951190
if: true && !contains(github.event.inputs.skiptests, 'cluster')
11961191
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1197-
11981192
build-old-macos-versions:
11991193
strategy:
12001194
fail-fast: false
@@ -1226,7 +1220,6 @@ jobs:
12261220
ref: ${{ env.GITHUB_HEAD_REF }}
12271221
- name: make
12281222
run: make SERVER_CFLAGS='-Werror'
1229-
12301223
test-freebsd:
12311224
runs-on: macos-13
12321225
if: |
@@ -1256,7 +1249,6 @@ jobs:
12561249
sudo pkg install -y bash gmake lang/tcl86 lang/tclx
12571250
gmake
12581251
./runtest --single unit/keyspace --single unit/auth --single unit/networking --single unit/protocol
1259-
12601252
test-alpine-jemalloc:
12611253
runs-on: ubuntu-latest
12621254
if: |
@@ -1297,7 +1289,6 @@ jobs:
12971289
- name: cluster tests
12981290
if: true && !contains(github.event.inputs.skiptests, 'cluster')
12991291
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1300-
13011292
test-alpine-libc-malloc:
13021293
runs-on: ubuntu-latest
13031294
if: |
@@ -1338,7 +1329,6 @@ jobs:
13381329
- name: cluster tests
13391330
if: true && !contains(github.event.inputs.skiptests, 'cluster')
13401331
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1341-
13421332
reply-schemas-validator:
13431333
runs-on: ubuntu-latest
13441334
timeout-minutes: 1440
@@ -1383,7 +1373,6 @@ jobs:
13831373
path: "./utils/req-res-validator/requirements.txt"
13841374
- name: validator
13851375
run: ./utils/req-res-log-validator.py --verbose --fail-missing-reply-schemas ${{ (!contains(github.event.inputs.skiptests, 'valkey') && !contains(github.event.inputs.skiptests, 'module') && !contains(github.event.inputs.sentinel, 'valkey') && !contains(github.event.inputs.skiptests, 'cluster')) && github.event.inputs.test_args == '' && github.event.inputs.cluster_test_args == '' && '--fail-commands-not-all-hit' || '' }}
1386-
13871376
notify-about-job-results:
13881377
runs-on: ubuntu-latest
13891378
if: always() && github.event_name == 'schedule' && github.repository == 'valkey-io/valkey'

0 commit comments

Comments
 (0)