CI: Move coverage build to non-special build list

This commit is contained in:
Max K 2024-06-05 09:34:31 +02:00
parent 02a3049876
commit 06c9438341
3 changed files with 12 additions and 6 deletions

View File

@ -106,7 +106,7 @@ jobs:
data: ${{ needs.RunConfig.outputs.data }}
# stage for jobs that do not prohibit merge
Tests_3:
needs: [RunConfig, Builds_1]
needs: [RunConfig, Builds_1, Builds_2]
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
uses: ./.github/workflows/reusable_test_stage.yml
with:

View File

@ -135,7 +135,7 @@ jobs:
data: ${{ needs.RunConfig.outputs.data }}
# stage for jobs that do not prohibit merge
Tests_3:
needs: [RunConfig, Tests_1, Tests_2]
needs: [RunConfig, Builds_1, Tests_1, Builds_2, Tests_2]
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
uses: ./.github/workflows/reusable_test_stage.yml
with:

View File

@ -593,8 +593,6 @@ class CIConfig:
stage_type = CIStages.BUILDS_2
elif self.is_docs_job(job_name):
stage_type = CIStages.TESTS_1
elif job_name == JobNames.BUILD_CHECK_SPECIAL:
stage_type = CIStages.TESTS_2
elif self.is_test_job(job_name):
if job_name in CI_CONFIG.test_configs:
required_build = CI_CONFIG.test_configs[job_name].required_build
@ -854,6 +852,14 @@ class CIConfig:
f"The requirement '{test_config}' for "
f"'{test_name}' is not found in builds"
)
if (
test_config.required_build
and test_config.required_build
not in self.builds_report_config[JobNames.BUILD_CHECK].builds
):
errors.append(
f"Test job' required build must be from [{JobNames.BUILD_CHECK}] list"
)
if errors:
raise KeyError("config contains errors", errors)
@ -1068,6 +1074,8 @@ CI_CONFIG = CIConfig(
Build.PACKAGE_MSAN,
Build.PACKAGE_DEBUG,
Build.BINARY_RELEASE,
Build.PACKAGE_RELEASE_COVERAGE,
Build.FUZZERS,
]
),
JobNames.BUILD_CHECK_SPECIAL: BuildReportConfig(
@ -1084,8 +1092,6 @@ CI_CONFIG = CIConfig(
Build.BINARY_LOONGARCH64,
Build.BINARY_AMD64_COMPAT,
Build.BINARY_AMD64_MUSL,
Build.PACKAGE_RELEASE_COVERAGE,
Build.FUZZERS,
]
),
},