Skip to content

Commit 2c41482

Browse files
szybiaszybia
authored
Merge branch 'main' into security-stats
2 parents c539883 + ebc291e commit 2c41482

File tree

541 files changed

+12778
-2546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+12778
-2546
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4", "9.2.0"]
68+
BWC_VERSION: ["8.18.8", "8.19.4", "9.1.4", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ steps:
347347
- signal_reason: agent_stop
348348
limit: 3
349349

350-
- label: 8.18.7 / bwc
351-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.7#bwcTest
350+
- label: 8.18.8 / bwc
351+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.8#bwcTest
352352
timeout_in_minutes: 300
353353
agents:
354354
provider: gcp
@@ -357,7 +357,7 @@ steps:
357357
buildDirectory: /dev/shm/bk
358358
preemptible: true
359359
env:
360-
BWC_VERSION: 8.18.7
360+
BWC_VERSION: 8.18.8
361361
retry:
362362
automatic:
363363
- exit_status: "-1"
@@ -512,14 +512,14 @@ steps:
512512
machineType: n1-standard-32
513513
buildDirectory: /dev/shm/bk
514514
env:
515-
GRADLE_PARAMS: "-Druntime.java=${JAVA_EA_VERSION}"
515+
GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
516516
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
517517
- label: "{{matrix.BWC_VERSION}} / matrix-bwc"
518518
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
519519
timeout_in_minutes: 300
520520
matrix:
521521
setup:
522-
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4", "9.2.0"]
522+
BWC_VERSION: ["8.18.8", "8.19.4", "9.1.4", "9.2.0"]
523523
agents:
524524
provider: gcp
525525
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.7 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.7
321+
- label: "{{matrix.image}} / 8.18.8 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.8
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,7 +332,7 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.7
335+
BWC_VERSION: 8.18.8
336336

337337
- label: "{{matrix.image}} / 8.19.4 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.4

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.7 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.7#bwcTest
347+
- label: 8.18.8 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.8#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.7
357+
BWC_VERSION: 8.18.8
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4", "9.2.0"]
509+
BWC_VERSION: ["8.18.8", "8.19.4", "9.1.4", "9.2.0"]
510510
agents:
511511
provider: gcp
512512
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552552
- openjdk23
553-
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4", "9.2.0"]
553+
BWC_VERSION: ["8.18.8", "8.19.4", "9.1.4", "9.2.0"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

‎.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,68 @@ exports[`generatePipelines should generate correct pipelines with a non-docs cha
309309
},
310310
]
311311
`;
312+
313+
exports[`generatePipelines should generate correct pipelines with a different branch that is not skipped 1`] = `
314+
[
315+
{
316+
"name": "bwc-snapshots",
317+
"pipeline": {
318+
"steps": [
319+
{
320+
"group": "bwc-snapshots",
321+
"steps": [
322+
{
323+
"agents": {
324+
"buildDirectory": "/dev/shm/bk",
325+
"image": "family/elasticsearch-ubuntu-2404",
326+
"machineType": "custom-32-98304",
327+
"provider": "gcp",
328+
},
329+
"command": ".ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTest",
330+
"env": {
331+
"BWC_VERSION": "{{matrix.BWC_VERSION}}",
332+
},
333+
"label": "{{matrix.BWC_VERSION}} / bwc-snapshots",
334+
"matrix": {
335+
"setup": {
336+
"BWC_VERSION": [
337+
"7.17.14",
338+
"8.10.3",
339+
"8.11.0",
340+
],
341+
},
342+
},
343+
"timeout_in_minutes": 300,
344+
},
345+
],
346+
},
347+
],
348+
},
349+
},
350+
{
351+
"name": "skip-branch",
352+
"pipeline": {
353+
"steps": [
354+
{
355+
"command": "echo 1",
356+
"label": "skip-me",
357+
},
358+
],
359+
},
360+
},
361+
{
362+
"name": "using-defaults",
363+
"pipeline": {
364+
"env": {
365+
"CUSTOM_ENV_VAR": "value",
366+
},
367+
"steps": [
368+
{
369+
"command": "echo 'hello world'",
370+
"label": "test-step",
371+
},
372+
],
373+
},
374+
},
375+
]
376+
`;

‎.buildkite/scripts/pull-request/mocks/pipelines/skip-branch.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config:
2+
skip-target-branches: "test-branch"
3+
steps:
4+
- label: skip-me
5+
command: echo 1

‎.buildkite/scripts/pull-request/pipeline.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ describe("generatePipelines", () => {
88
setBwcVersionsPath(`${import.meta.dir}/mocks/bwcVersions`);
99
setSnapshotBwcVersionsPath(`${import.meta.dir}/mocks/snapshotBwcVersions`);
1010

11+
process.env["GITHUB_PR_TARGET_BRANCH"] = "test-branch";
1112
process.env["GITHUB_PR_LABELS"] = "test-label-1,test-label-2";
1213
process.env["GITHUB_PR_TRIGGER_COMMENT"] = "";
1314
});
@@ -36,6 +37,12 @@ describe("generatePipelines", () => {
3637
testWithTriggerCheck(`${import.meta.dir}/mocks/pipelines`, ["build.gradle"]);
3738
});
3839

40+
test("should generate correct pipelines with a different branch that is not skipped", () => {
41+
process.env["GITHUB_PR_TARGET_BRANCH"] = "main";
42+
43+
testWithTriggerCheck(`${import.meta.dir}/mocks/pipelines`, ["build.gradle"]);
44+
});
45+
3946
test("should generate correct pipeline when using a trigger comment for it", () => {
4047
process.env["GITHUB_PR_TRIGGER_COMMENT"] = "run elasticsearch-ci/using-defaults";
4148

‎.buildkite/scripts/pull-request/pipeline.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ const changedFilesIncludedCheck = (pipeline: EsPipeline, changedFiles: string[])
5050
return true;
5151
};
5252

53+
const checkTargetBranch = (pipeline: EsPipeline, targetBranch: string | undefined) => {
54+
if (!targetBranch || !pipeline.config?.["skip-target-branches"]) {
55+
return true;
56+
}
57+
58+
return !getArray(pipeline.config["skip-target-branches"]).some((branch) => branch === targetBranch);
59+
};
60+
5361
const triggerCommentCheck = (pipeline: EsPipeline): boolean => {
5462
if (process.env["GITHUB_PR_TRIGGER_COMMENT"] && pipeline.config?.["trigger-phrase"]) {
5563
return !!process.env["GITHUB_PR_TRIGGER_COMMENT"].match(pipeline.config["trigger-phrase"]);
@@ -138,6 +146,7 @@ export const generatePipelines = (
138146
}
139147

140148
let filters: ((pipeline: EsPipeline) => boolean)[] = [
149+
(pipeline) => checkTargetBranch(pipeline, process.env["GITHUB_PR_TARGET_BRANCH"]),
141150
(pipeline) => labelCheckAllow(pipeline, labels),
142151
(pipeline) => labelCheckSkip(pipeline, labels),
143152
(pipeline) => changedFilesExcludedCheck(pipeline, changedFiles),

‎.buildkite/scripts/pull-request/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export type EsPipelineConfig = {
55
"included-regions"?: string | string[];
66
"excluded-regions"?: string | string[];
77
"trigger-phrase"?: string;
8+
"skip-target-branches"?: string | string[];
89
};
910
};
1011

‎.buildkite/scripts/trigger-if-java-ea-new-build.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,21 @@ echo "SHOULD_TRIGGER: $SHOULD_TRIGGER"
8080

8181
if [[ "$SHOULD_TRIGGER" == "true" ]]; then
8282
EFFECTIVE_START_DATE=$(date -u -d "@$BUILD_TIME" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || date -u -r "$BUILD_TIME" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || echo "")
83+
84+
# Use "master" branch for elasticsearch-performance-esbench-jdk when BUILDKITE_BRANCH is "main"
85+
TRIGGER_BRANCH="$BUILDKITE_BRANCH"
86+
if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
87+
TRIGGER_BRANCH="master"
88+
fi
89+
8390
echo "Triggering performance-esbench-jdk for new jdk build $JDK_IDENTIFIER"
8491
cat << EOF | buildkite-agent pipeline upload
8592
steps:
8693
- trigger: elasticsearch-performance-esbench-jdk
8794
label: Triggering performance-esbench-jdk for new jdk build $JDK_IDENTIFIER
8895
async: true
8996
build:
90-
branch: "$BUILDKITE_BRANCH"
97+
branch: "$TRIGGER_BRANCH"
9198
env:
9299
EFFECTIVE_START_DATE: "$EFFECTIVE_START_DATE"
93100
EXECUTION_MODE: "start-run"

0 commit comments

Comments
 (0)