@@ -68,37 +68,36 @@ jobs:
6868 IGNORED_TESTS=$(yq '.test_matrix.unit.ignored_tests // [] | tojson(0)' "$CONFIG_FILE")
6969 echo "ignored_tests=$IGNORED_TESTS" >> $GITHUB_OUTPUT
7070
71- unit_tests :
72- needs : checkout_and_config
73- strategy :
74- fail-fast : false
75- matrix :
76- device : ${{ fromJson(needs.checkout_and_config.outputs.device_types) }}
77- uses : ./.github/workflows/unit_tests_common.yml
78- name : unit_tests
79- with :
80- platform : ${{ inputs.platform }}
81- device : ${{ matrix.device }}
82- image : ${{ needs.checkout_and_config.outputs.ci_image }}
83- runs_on : ${{ needs.checkout_and_config.outputs.runs_on }}
84- container_volumes : ${{ needs.checkout_and_config.outputs.container_volumes }}
85- container_options : ${{ needs.checkout_and_config.outputs.container_options }}
86- ignored_tests : ${{ needs.checkout_and_config.outputs.ignored_tests }}
87-
88- # arguments.py not compatible with megatron-core-fl
89- # functional_tests_train:
90- # needs:
91- # - checkout_and_config
92- # - unit_tests
93- # if: fromJson(needs.checkout_and_config.outputs.train_test_matrix)[0] != null
94- # uses: ./.github/workflows/functional_tests_train.yml
71+ # unit_tests:
72+ # needs: checkout_and_config
73+ # strategy:
74+ # fail-fast: false
75+ # matrix:
76+ # device: ${{ fromJson(needs.checkout_and_config.outputs.device_types) }}
77+ # uses: ./.github/workflows/unit_tests_common.yml
78+ # name: unit_tests
9579 # with:
9680 # platform: ${{ inputs.platform }}
97- # test_matrix : ${{ needs.checkout_and_config.outputs.train_test_matrix }}
81+ # device : ${{ matrix.device }}
9882 # image: ${{ needs.checkout_and_config.outputs.ci_image }}
9983 # runs_on: ${{ needs.checkout_and_config.outputs.runs_on }}
10084 # container_volumes: ${{ needs.checkout_and_config.outputs.container_volumes }}
10185 # container_options: ${{ needs.checkout_and_config.outputs.container_options }}
86+ # ignored_tests: ${{ needs.checkout_and_config.outputs.ignored_tests }}
87+
88+ # arguments.py not compatible with megatron-core-fl
89+ functional_tests :
90+ needs :
91+ - checkout_and_config
92+ if : fromJson(needs.checkout_and_config.outputs.train_test_matrix)[0] != null
93+ uses : ./.github/workflows/functional_tests_common.yml
94+ with :
95+ platform : ${{ inputs.platform }}
96+ test_matrix : ${{ needs.checkout_and_config.outputs.train_test_matrix }}
97+ image : ${{ needs.checkout_and_config.outputs.ci_image }}
98+ runs_on : ${{ needs.checkout_and_config.outputs.runs_on }}
99+ container_volumes : ${{ needs.checkout_and_config.outputs.container_volumes }}
100+ container_options : ${{ needs.checkout_and_config.outputs.container_options }}
102101
103102
104103 all_tests_complete :
@@ -107,8 +106,8 @@ jobs:
107106 shell : bash
108107 needs :
109108 - checkout_and_config
110- - unit_tests
111- # - functional_tests_train
109+ # - unit_tests
110+ - functional_tests
112111 runs-on : ubuntu-latest
113112 if : always()
114113 steps :
@@ -117,20 +116,20 @@ jobs:
117116 # Check all test jobs (skip if not run)
118117 failed=false
119118
120- if [ "${{ needs.unit_tests.result }}" != "success" ]; then
121- echo "❌ Unit tests failed"
122- failed=true
123- fi
124-
125- # # Only check functional tests if they ran
126- # if [ "${{ needs.functional_tests_train.result }}" != "success" ] && \
127- # [ "${{ needs.functional_tests_train.result }}" != "skipped" ]; then
128- # echo "❌ Training functional tests failed"
119+ # if [ "${{ needs.unit_tests.result }}" != "success" ]; then
120+ # echo "❌ Unit tests failed"
129121 # failed=true
130122 # fi
131123
124+ # # Only check functional tests if they ran
125+ if [ "${{ needs.functional_tests.result }}" != "success" ] && \
126+ [ "${{ needs.functional_tests.result }}" != "skipped" ]; then
127+ echo "❌ Training functional tests failed"
128+ failed=true
129+ fi
130+
132131 if [ "$failed" = "true" ]; then
133132 exit 1
134133 fi
135134
136- echo "✅ All tests completed successfully!"
135+ echo "✅ All tests completed successfully!"
0 commit comments