Skip to content

Commit c87f341

Browse files
Merge upstream main into fix/inherit-mlm-te-lock
Signed-off-by: svcnemo-autobot <svcnemo-autobot@nvidia.com>
2 parents 637e351 + 1ddf565 commit c87f341

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

‎.github/workflows/cicd-main.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
expect_l1: ${{ steps.configure.outputs.expect_l1 }}
9191
expect_l2: ${{ steps.configure.outputs.expect_l2 }}
9292
perf_scripts_only: ${{ steps.configure.outputs.perf_scripts_only }}
93+
skip_queue: ${{ steps.configure.outputs.skip_queue }}
9394
merge_sha: ${{ steps.merge-sha.outputs.merge_sha }}
9495
steps:
9596
- name: Get PR info
@@ -122,6 +123,7 @@ jobs:
122123
EVENT_NAME: ${{ github.event_name }}
123124
REF: ${{ github.ref }}
124125
TEST_SUITE: ${{ github.event.inputs.test_suite }}
126+
PR_HEAD_LABEL: ${{ fromJSON(steps.get-pr-info.outputs.pr-info || '{}').head.label || '' }}
125127
run: |
126128
PR_NUMBER=${{ fromJSON(steps.get-pr-info.outputs.pr-info || '{}').number }}
127129
@@ -131,6 +133,9 @@ jobs:
131133
NEEDS_MORE_TESTS=$(echo "$LABELS" | jq 'any(. == "needs-more-tests")')
132134
FULL_TEST_SUITE=$(echo "$LABELS" | jq 'any(. == "full-test-suite")')
133135
136+
SKIP_QUEUE=false
137+
[[ "$PR_HEAD_LABEL" == svcnemo-autobot:chore/bump-mcore-* ]] && SKIP_QUEUE=true
138+
134139
# Detect if every changed file lives under scripts/performance/
135140
PERF_SCRIPTS_ONLY=false
136141
if [[ -n "$PR_NUMBER" ]]; then
@@ -173,6 +178,7 @@ jobs:
173178
echo "docs_only=$DOCS_ONLY" | tee -a "$GITHUB_OUTPUT"
174179
echo "needs_more_tests=$NEEDS_MORE_TESTS" | tee -a "$GITHUB_OUTPUT"
175180
echo "full_test_suite=$FULL_TEST_SUITE" | tee -a "$GITHUB_OUTPUT"
181+
echo "skip_queue=$SKIP_QUEUE" | tee -a "$GITHUB_OUTPUT"
176182
echo "expect_l0=$EXPECT_L0" | tee -a "$GITHUB_OUTPUT"
177183
echo "expect_l1=$EXPECT_L1" | tee -a "$GITHUB_OUTPUT"
178184
echo "expect_l2=$EXPECT_L2" | tee -a "$GITHUB_OUTPUT"
@@ -296,7 +302,8 @@ jobs:
296302
!(needs.pre-flight.outputs.is_ci_workload == 'true'
297303
|| needs.pre-flight.outputs.is_deployment_workflow == 'true'
298304
|| needs.configure.outputs.docs_only == 'true'
299-
|| needs.configure.outputs.perf_scripts_only == 'true')
305+
|| needs.configure.outputs.perf_scripts_only == 'true'
306+
|| needs.configure.outputs.skip_queue == 'true')
300307
&& github.event_name != 'merge_group'
301308
steps:
302309
- name: Running CI tests
@@ -310,6 +317,7 @@ jobs:
310317
(
311318
success()
312319
|| needs.pre-flight.outputs.is_ci_workload == 'true'
320+
|| needs.configure.outputs.skip_queue == 'true'
313321
|| needs.pre-flight.outputs.force_run_all == 'true'
314322
|| github.event_name == 'merge_group'
315323
)
@@ -340,7 +348,7 @@ jobs:
340348
echo "matrix=$MATRIX" | tee -a "$GITHUB_OUTPUT"
341349
342350
cicd-container-build:
343-
needs: [pre-flight, configure, cicd-wait-in-queue, cicd-compute-build-matrix]
351+
needs: [pre-flight, configure, cicd-compute-build-matrix]
344352
strategy:
345353
fail-fast: false
346354
matrix: ${{ fromJson(needs.cicd-compute-build-matrix.outputs.matrix) }}
@@ -534,7 +542,7 @@ jobs:
534542
)
535543
&& !cancelled()
536544
&& needs.configure.outputs.perf_scripts_only != 'true'
537-
needs: [pre-flight, configure, cicd-wait-in-queue, cicd-container-build]
545+
needs: [pre-flight, configure, cicd-container-build]
538546
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}
539547
name: Launch_Import_Check
540548
steps:
@@ -565,7 +573,7 @@ jobs:
565573
)
566574
&& !cancelled()
567575
&& (github.event.inputs.test_suite == '' || github.event.inputs.test_suite == 'all' || github.event.inputs.test_suite == 'unit-only' || contains('L0 L1 L2', github.event.inputs.test_suite))
568-
needs: [pre-flight, configure, cicd-wait-in-queue, cicd-container-build]
576+
needs: [pre-flight, configure, cicd-container-build]
569577
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}
570578
name: Launch_Unit_Tests_Core
571579
env:
@@ -606,7 +614,7 @@ jobs:
606614
)
607615
&& !cancelled()
608616
&& (github.event.inputs.test_suite == '' || github.event.inputs.test_suite == 'all' || github.event.inputs.test_suite == 'unit-only' || contains('L0 L1 L2', github.event.inputs.test_suite))
609-
needs: [pre-flight, configure, cicd-wait-in-queue, cicd-container-build]
617+
needs: [pre-flight, configure, cicd-container-build]
610618
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}
611619
name: Launch_Unit_Tests_Diffusion
612620
env:

0 commit comments

Comments
 (0)