Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ jjbb-template: matrix-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake bwc"
- job-description: Elasticsearch %BRANCH% branch intake backwards compatibility checks.
- matrix-yaml-file: ".ci/snapshotBwcVersions"
- matrix-variable: BWC_VERSION
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$BWC_VERSION#bwcTest"
1 change: 0 additions & 1 deletion .ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part1
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 1"
- job-description: Elasticsearch %BRANCH% branch intake check part 1.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1"
1 change: 0 additions & 1 deletion .ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part2
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 2"
- job-description: Elasticsearch %BRANCH% branch intake check part 2.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2"
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+sanity-check
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake sanity check"
- job-description: Elasticsearch %BRANCH% branch intake sanity check.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
- job:
name: elastic+elasticsearch+%BRANCH%+intake+multijob+update-last-good-commit
display-name: "elastic / elasticsearch # %BRANCH% - update last good commit"
description: Elasticsearch %BRANCH% branch update last good commit in build-stats.
description: "This job has been migrated to Buildkite.\n"
disabled: true
node: light
properties: []
builders:
Expand Down
18 changes: 3 additions & 15 deletions .ci/jobs.t/elastic+elasticsearch+intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,12 @@
- job:
name: elastic+elasticsearch+%BRANCH%+intake
display-name: "elastic / elasticsearch # %BRANCH% - intake"
description: "Testing of the Elasticsearch %BRANCH% branch on every push.\n"
description: "This job has been migrated to Buildkite.\n"
disabled: true
project-type: multijob
node: master
vault: []
triggers:
# We use this trigger instead of the provided "github" webhook trigger because it's more robust.
# Here we only trigger builds for pushes to the corresponding branch, rather than a push to any branch of the
# configured git repository. This avoids duplicate builds being triggered when pushes to multiple branches are
# done in quick succession.
- generic-webhook-trigger:
post-content-params:
- type: JSONPath
key: ref
value: '$.ref'
regex-filter-text: '$ref'
regex-filter-expression: "^refs/heads/%BRANCH%$"
cause: Push to GitHub (refs/heads/%BRANCH%)
silent-response: true
triggers: []
scm:
- git:
wipe-workspace: false
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
jjbb-template: matrix-gradle-unix-disabled.yml
jjbb-template: matrix-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+periodic+bwc
- job-display-name: "elastic / elasticsearch # %BRANCH% - backwards compatibility matrix"
Expand Down
5 changes: 3 additions & 2 deletions .ci/templates.t/generic-gradle-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
- job:
name: "{job-name}"
display-name: "{job-display-name}"
description: "{job-description}"
description: "This job has been migrated to Buildkite.\n"
disabled: true
workspace: /dev/shm/{job-name}
builders:
- inject:
properties-file: '.ci/java-versions.properties'
properties-file: ".ci/java-versions.properties"
properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
JAVA11_HOME=$HOME/.java/java11
Expand Down
32 changes: 0 additions & 32 deletions .ci/templates.t/matrix-gradle-unix-disabled.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .ci/templates.t/matrix-gradle-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
- job:
name: "{job-name}"
display-name: "{job-display-name}"
description: "{job-description}"
description: "This job has been migrated to Buildkite.\n"
disabled: true
project-type: matrix
child-workspace: /dev/shm/{job-name}
node: master
Expand All @@ -21,7 +22,7 @@
name: "{matrix-variable}"
builders:
- inject:
properties-file: '.ci/java-versions.properties'
properties-file: ".ci/java-versions.properties"
properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
JAVA11_HOME=$HOME/.java/java11
Expand Down