Skip to content

Commit dce2a6e

Browse files
edipascaleqmonnet
authored andcommitted
fix(ci): disable upgrade jobs in merge queues
until the current issues are resolved. ideally we would do so based on labels as we do for pul requests, but that is not trivial Signed-off-by: Emanuele Di Pascale <[email protected]>
1 parent d448a61 commit dce2a6e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ jobs:
355355
# ci:-vlab disables virtual lab tests on PR
356356
# ci:-upgrade disables upgrade tests on PR
357357
# hlab is disabled for main and merge_queue till we have gateway tests for it
358+
# upgrade jobs are temporarily skipped in merge_queue until we fix the issue with 25.05
358359
skip: >-
359360
${{
360361
github.event_name == 'pull_request'
@@ -371,7 +372,7 @@ jobs:
371372
)
372373
373374
|| (github.event_name == 'push' || github.event_name == 'merge_group')
374-
&& matrix.hybrid
375+
&& (matrix.hybrid || matrix.upgradefrom != '')
375376
}}
376377
fabricatorref: master
377378
prebuild: "just bump dataplane x86_64-unknown-linux-gnu.release.${{ github.sha }}"

0 commit comments

Comments
 (0)