Skip to content

Commit 8e04136

Browse files
fm4vfm4v
committed
Revert "ci: switch asan_ubsan test jobs from amd to arm"
This reverts commit 707d72b.
1 parent 707d72b commit 8e04136

File tree

6 files changed

+374
-412
lines changed

6 files changed

+374
-412
lines changed

‎.github/workflows/backport_branches.yml‎

Lines changed: 55 additions & 93 deletions
Large diffs are not rendered by default.

‎.github/workflows/master.yml‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎.github/workflows/pull_request.yml‎

Lines changed: 163 additions & 163 deletions
Large diffs are not rendered by default.

‎.github/workflows/release_branches.yml‎

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

‎ci/defs/job_configs.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,9 @@ class JobConfigs:
450450
)
451451
stateless_tests_flaky_pr_jobs = common_ft_job_config.parametrize(
452452
Job.ParamSet(
453-
parameter="arm_asan_ubsan, flaky check",
454-
runs_on=RunnerLabels.ARM_MEDIUM,
455-
requires=[ArtifactNames.CH_ARM_ASAN_UBSAN],
453+
parameter="amd_asan_ubsan, flaky check",
454+
runs_on=RunnerLabels.AMD_MEDIUM,
455+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
456456
),
457457
Job.ParamSet(
458458
parameter="amd_tsan, flaky check",
@@ -515,17 +515,17 @@ class JobConfigs:
515515
functional_tests_jobs = common_ft_job_config.parametrize(
516516
*[
517517
Job.ParamSet(
518-
parameter=f"arm_asan_ubsan, distributed plan, parallel, {batch}/{total_batches}",
519-
runs_on=RunnerLabels.ARM_MEDIUM_CPU,
520-
requires=[ArtifactNames.CH_ARM_ASAN_UBSAN],
518+
parameter=f"amd_asan_ubsan, distributed plan, parallel, {batch}/{total_batches}",
519+
runs_on=RunnerLabels.AMD_MEDIUM_CPU,
520+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
521521
)
522522
for total_batches in (2,)
523523
for batch in range(1, total_batches + 1)
524524
],
525525
Job.ParamSet(
526-
parameter="arm_asan_ubsan, db disk, distributed plan, sequential",
527-
runs_on=RunnerLabels.ARM_SMALL_MEM,
528-
requires=[ArtifactNames.CH_ARM_ASAN_UBSAN],
526+
parameter="amd_asan_ubsan, db disk, distributed plan, sequential",
527+
runs_on=RunnerLabels.AMD_SMALL_MEM,
528+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
529529
),
530530
Job.ParamSet(
531531
parameter="amd_llvm_coverage, old analyzer, s3 storage, DatabaseReplicated, WasmEdge, parallel",
@@ -758,9 +758,9 @@ class JobConfigs:
758758
integration_test_asan_master_jobs = common_integration_test_job_config.parametrize(
759759
*[
760760
Job.ParamSet(
761-
parameter=f"arm_asan_ubsan, db disk, {batch}/{total_batches}",
762-
runs_on=RunnerLabels.ARM_MEDIUM,
763-
requires=[ArtifactNames.DEB_ARM_ASAN_UBSAN],
761+
parameter=f"amd_asan_ubsan, db disk, {batch}/{total_batches}",
762+
runs_on=RunnerLabels.AMD_MEDIUM,
763+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
764764
)
765765
for total_batches in (4,)
766766
for batch in range(1, total_batches + 1)
@@ -769,9 +769,9 @@ class JobConfigs:
769769
integration_test_jobs_required = common_integration_test_job_config.parametrize(
770770
*[
771771
Job.ParamSet(
772-
parameter=f"arm_asan_ubsan, db disk, old analyzer, {batch}/{total_batches}",
773-
runs_on=RunnerLabels.ARM_MEDIUM,
774-
requires=[ArtifactNames.DEB_ARM_ASAN_UBSAN],
772+
parameter=f"amd_asan_ubsan, db disk, old analyzer, {batch}/{total_batches}",
773+
runs_on=RunnerLabels.AMD_MEDIUM,
774+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
775775
)
776776
for total_batches in (6,)
777777
for batch in range(1, total_batches + 1)
@@ -818,9 +818,9 @@ class JobConfigs:
818818
integration_test_asan_flaky_pr_jobs = (
819819
common_integration_test_job_config.parametrize(
820820
Job.ParamSet(
821-
parameter=f"arm_asan_ubsan, flaky",
822-
runs_on=RunnerLabels.ARM_MEDIUM,
823-
requires=[ArtifactNames.DEB_ARM_ASAN_UBSAN],
821+
parameter=f"amd_asan_ubsan, flaky",
822+
runs_on=RunnerLabels.AMD_MEDIUM,
823+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
824824
)
825825
)
826826
)
@@ -880,9 +880,9 @@ class JobConfigs:
880880

881881
integration_test_targeted_pr_jobs = common_integration_test_job_config.parametrize(
882882
Job.ParamSet(
883-
parameter=f"arm_asan_ubsan, targeted",
884-
runs_on=RunnerLabels.ARM_MEDIUM,
885-
requires=[ArtifactNames.DEB_ARM_ASAN_UBSAN],
883+
parameter=f"amd_asan_ubsan, targeted",
884+
runs_on=RunnerLabels.AMD_MEDIUM,
885+
requires=[ArtifactNames.CH_AMD_ASAN_UBSAN],
886886
)
887887
)
888888
compatibility_test_jobs = Job.Config(

‎ci/workflows/backport_branches.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*[
1313
job
1414
for job in JobConfigs.build_jobs
15-
if any(t in job.name for t in ("amd_asan_ubsan", "arm_asan_ubsan", "amd_tsan", "debug"))
15+
if any(t in job.name for t in ("amd_asan_ubsan", "amd_tsan", "debug"))
1616
],
1717
*JobConfigs.release_build_jobs,
1818
*[

0 commit comments

Comments
 (0)