Skip to content

Commit 110a926

Browse files
committed
Remove CI matrix jobs for entitlements
Now that entitlements are always enabled, there is no need for duplicating PR jobs for entitlements enabled and not enabled. This commit removes the buildkite setup for the entitlements jobs.
1 parent 8047250 commit 110a926

File tree

7 files changed

+4
-67
lines changed

7 files changed

+4
-67
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ steps:
7878
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7979
- group: java-matrix
8080
steps:
81-
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
82-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
81+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
82+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
8383
timeout_in_minutes: 300
8484
matrix:
8585
setup:
@@ -94,9 +94,6 @@ steps:
9494
- checkPart4
9595
- checkPart5
9696
- checkRestCompat
97-
ENTITLEMENTS_ENABLED:
98-
- "true"
99-
- "false"
10097
agents:
10198
provider: gcp
10299
image: family/elasticsearch-ubuntu-2004
@@ -105,7 +102,6 @@ steps:
105102
env:
106103
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
107104
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
108-
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
109105
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
110106
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
111107
timeout_in_minutes: 300

.buildkite/pipelines/periodic.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ steps:
497497
BWC_VERSION: "{{matrix.BWC_VERSION}}"
498498
- group: java-matrix
499499
steps:
500-
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
501-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
500+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
501+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
502502
timeout_in_minutes: 300
503503
matrix:
504504
setup:
@@ -513,9 +513,6 @@ steps:
513513
- checkPart4
514514
- checkPart5
515515
- checkRestCompat
516-
ENTITLEMENTS_ENABLED:
517-
- "true"
518-
- "false"
519516
agents:
520517
provider: gcp
521518
image: family/elasticsearch-ubuntu-2004
@@ -524,7 +521,6 @@ steps:
524521
env:
525522
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
526523
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
527-
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
528524
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
529525
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
530526
timeout_in_minutes: 300

.buildkite/pipelines/pull-request/part-1-entitlements.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.buildkite/pipelines/pull-request/part-2-entitlements.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.buildkite/pipelines/pull-request/part-3-entitlements.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.buildkite/pipelines/pull-request/part-4-entitlements.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.buildkite/pipelines/pull-request/part-5-entitlements.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)