Skip to content

Commit ef0ce13

Browse files
committed
Use the same vm for all tests
Use images we are building for LS testing for all BK pipelines.
1 parent c5987ae commit ef0ce13

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.buildkite/scripts/build-pipeline/generate-steps.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ def generate_steps_for_main_branch(versions) -> list:
6363
structure = {
6464
"agents": {
6565
"provider": "gcp",
66-
"machineType": "n1-standard-4",
67-
"image": "family/core-ubuntu-2204"
66+
"machineType": "n2-standard-4",
67+
"imageProject": "elastic-images-prod",
68+
"image": "family/platform-ingest-logstash-multi-jdk-ubuntu-2204",
69+
"diskSizeGb": 120
6870
},
6971
"steps": []}
7072

.buildkite/scripts/pull-request-pipeline/generate-steps.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ def make_matrix_version_key(branch: str) -> str:
6161
structure = {
6262
"agents": {
6363
"provider": "gcp",
64-
"machineType": "n1-standard-4",
65-
"image": "family/core-ubuntu-2204"
64+
"machineType": "n2-standard-4",
65+
"imageProject": "elastic-images-prod",
66+
"image": "family/platform-ingest-logstash-multi-jdk-ubuntu-2204",
67+
"diskSizeGb": 120
6668
},
6769
"steps": []}
6870

.buildkite/scripts/run_tests.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:/opt/buildkite-agent/.java/bin:$PATH"
4+
export JAVA_HOME="/opt/buildkite-agent/.java"
5+
eval "$(rbenv init -)"
16

27
if [ -z "$TARGET_BRANCH" ]; then
38
echo "Target branch is not specified, using default branch: main or BK defined"

0 commit comments

Comments
 (0)