diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ce4b259870a8..db56fe1d15ae 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568 + commit: fc19ce3a7322a10ab791de755c950a56744a12e7 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568 + commit: fc19ce3a7322a10ab791de755c950a56744a12e7 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8da88e031d10..47ec4b0cc4ed 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568 + commit: fc19ce3a7322a10ab791de755c950a56744a12e7 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568 + commit: fc19ce3a7322a10ab791de755c950a56744a12e7 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/native_jobs.py b/ci/praktika/native_jobs.py index 2da82a28c5ca..af1181792000 100644 --- a/ci/praktika/native_jobs.py +++ b/ci/praktika/native_jobs.py @@ -18,6 +18,7 @@ from .runtime import RunConfig from .settings import Settings from .utils import Shell, Utils +from ci.defs.defs import ArtifactNames assert Settings.CI_CONFIG_RUNS_ON @@ -403,17 +404,22 @@ def check_affected_jobs(): # NOTE (strtgbb): We always want these build artifacts for our report and regression tests. # If we make FinishCIReport and regression tests into praktika jobs, we can remove this. if "CIReport" in workflow.additional_jobs: - all_required_artifacts.update(["CH_AMD_RELEASE", "CH_ARM_RELEASE"]) + all_required_artifacts.update( + [ + ArtifactNames.CH_AMD_RELEASE, + ArtifactNames.CH_ARM_RELEASE, + ] + ) if ( "Regression" in workflow.additional_jobs and "regression" not in workflow_config.custom_data.get("ci_exclude_tags", []) ): - all_required_artifacts.update(["CH_AMD_BINARY"]) + all_required_artifacts.update([ArtifactNames.CH_AMD_BINARY]) if "aarch64" not in workflow_config.custom_data.get( "ci_exclude_tags", [] ): - all_required_artifacts.update(["CH_ARM_BINARY"]) + all_required_artifacts.update([ArtifactNames.CH_ARM_BINARY]) print(f"Including artifacts for custom jobs [{all_required_artifacts}]") for job in workflow.jobs: diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index 05778df7c8f7..96a7a66da223 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568" + REGRESSION_HASH = "fc19ce3a7322a10ab791de755c950a56744a12e7" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: