Skip to content

Commit

Permalink
ci: Undo still OoMing smaller agents
Browse files Browse the repository at this point in the history
  • Loading branch information
@def-
def- committed Jan 2, 2024
1 parent 569d564 commit 2cd36ac
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 29 deletions.
66 changes: 40 additions & 26 deletions ci/nightly/pipeline.template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,8 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
# A larger instance is needed due to frequent OOMs
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -441,7 +442,8 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
# A larger instance is needed due to frequent OOMs
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -452,7 +454,7 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -463,7 +465,7 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -474,7 +476,7 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -485,7 +487,7 @@ steps:
timeout_in_minutes: 60
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -496,7 +498,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -508,7 +510,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -520,7 +522,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -532,7 +534,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -544,7 +546,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -556,7 +558,7 @@ steps:
skip: "Affected by #23882"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -567,7 +569,7 @@ steps:
label: "Checks upgrade, whole-Mz restart"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -578,7 +580,7 @@ steps:
label: "Checks upgrade from previous version, whole-Mz restart"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -589,7 +591,7 @@ steps:
label: "Checks upgrade across two versions"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -600,7 +602,7 @@ steps:
label: "Checks upgrade from X-2 directly to HEAD"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -611,7 +613,7 @@ steps:
label: "Checks upgrade across four versions"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -622,7 +624,7 @@ steps:
label: "Platform checks upgrade, restarting compute clusterd first"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -633,7 +635,7 @@ steps:
label: "Platform checks upgrade, restarting compute clusterd last"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
Expand All @@ -645,7 +647,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -656,7 +658,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -667,7 +669,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -678,7 +680,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -689,7 +691,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -700,7 +702,7 @@ steps:
timeout_in_minutes: 45
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -721,7 +723,7 @@ steps:
label: "Platform checks upgrade in Cloudtest/K8s"
timeout_in_minutes: 60
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/scratch-aws-access: ~
Expand Down Expand Up @@ -1066,6 +1068,18 @@ steps:
composition: parallel-workload
args: [--runtime=1500, --scenario=backup-restore, --naughty-identifiers]

- id: incident-70
label: "Test for incident 70"
timeout_in_minutes: 15
skip: "Affected by #15209"
agents:
queue: linux-x86_64-large
artifact_paths: junit_*.xml
plugins:
- ./ci/plugins/mzcompose:
composition: cluster
run: test-incident-70

- id: balancerd
label: "Tests for balancerd"
timeout_in_minutes: 15
Expand Down
4 changes: 2 additions & 2 deletions ci/test/pipeline.template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ steps:
parallelism: 3
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand All @@ -461,7 +461,7 @@ steps:
parallelism: 2
artifact_paths: junit_*.xml
agents:
queue: linux-x86_64
queue: builder-linux-x86_64
plugins:
- ./ci/plugins/mzcompose:
composition: platform-checks
Expand Down
3 changes: 2 additions & 1 deletion test/cluster/mzcompose.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None:
shard_count = int(shard_count)

for i, name in enumerate(c.workflows):
# incident-70 requires more memory, runs in separate CI step
# concurrent-connections is too flaky
if name in ("default", "test-concurrent-connections"):
if name in ("default", "test-incident-70", "test-concurrent-connections"):
continue
if shard is None or shard_count is None or i % int(shard_count) == shard:
with c.test_case(name):
Expand Down

0 comments on commit 2cd36ac

Please sign in to comment.