File tree Expand file tree Collapse file tree 7 files changed +47
-12
lines changed Expand file tree Collapse file tree 7 files changed +47
-12
lines changed Original file line number Diff line number Diff line change @@ -14,23 +14,23 @@ steps:
14
14
agents :
15
15
provider : gcp
16
16
image : family/elasticsearch-ubuntu-2004
17
- machineType : custom-32-98304
17
+ machineType : n1-standard-32
18
18
buildDirectory : /dev/shm/bk
19
19
- label : part2
20
20
command : .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
21
21
timeout_in_minutes : 300
22
22
agents :
23
23
provider : gcp
24
24
image : family/elasticsearch-ubuntu-2004
25
- machineType : custom-32-98304
25
+ machineType : n1-standard-32
26
26
buildDirectory : /dev/shm/bk
27
27
- label : part3
28
28
command : .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
29
29
timeout_in_minutes : 300
30
30
agents :
31
31
provider : gcp
32
32
image : family/elasticsearch-ubuntu-2004
33
- machineType : custom-32-98304
33
+ machineType : n1-standard-32
34
34
buildDirectory : /dev/shm/bk
35
35
- group : bwc-snapshots
36
36
steps :
Original file line number Diff line number Diff line change 54
54
agents :
55
55
provider : gcp
56
56
image : family/elasticsearch-ubuntu-2004
57
- machineType : custom-32-98304
57
+ machineType : n1-standard-32
58
58
buildDirectory : /dev/shm/bk
59
59
env :
60
60
ES_RUNTIME_JAVA : " {{matrix.ES_RUNTIME_JAVA}}"
82
82
agents :
83
83
provider : gcp
84
84
image : family/elasticsearch-ubuntu-2004
85
- machineType : custom-32-98304
85
+ machineType : n1-standard-32
86
86
buildDirectory : /dev/shm/bk
87
87
env :
88
88
ES_RUNTIME_JAVA : " {{matrix.ES_RUNTIME_JAVA}}"
@@ -180,3 +180,13 @@ steps:
180
180
image : family/elasticsearch-ubuntu-2004
181
181
machineType : n2-standard-8
182
182
buildDirectory : /dev/shm/bk
183
+ - label : Check branch consistency
184
+ command : .ci/scripts/run-gradle.sh branchConsistency
185
+ timeout_in_minutes : 15
186
+ agents :
187
+ provider : gcp
188
+ image : family/elasticsearch-ubuntu-2004
189
+ machineType : n2-standard-2
190
+ - label : Check branch protection rules
191
+ command : .buildkite/scripts/branch-protection.sh
192
+ timeout_in_minutes : 5
Original file line number Diff line number Diff line change @@ -1231,3 +1231,13 @@ steps:
1231
1231
image : family/elasticsearch-ubuntu-2004
1232
1232
machineType : n2-standard-8
1233
1233
buildDirectory : /dev/shm/bk
1234
+ - label : Check branch consistency
1235
+ command : .ci/scripts/run-gradle.sh branchConsistency
1236
+ timeout_in_minutes : 15
1237
+ agents :
1238
+ provider : gcp
1239
+ image : family/elasticsearch-ubuntu-2004
1240
+ machineType : n2-standard-2
1241
+ - label : Check branch protection rules
1242
+ command : .buildkite/scripts/branch-protection.sh
1243
+ timeout_in_minutes : 5
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ set -euo pipefail
4
+
5
+ STATUS=$( curl -s " https://api.github.com/repos/elastic/elasticsearch/branches/$BUILDKITE_BRANCH " | jq ' .protected' )
6
+ echo " Branch $BUILDKITE_BRANCH protection status is: $STATUS "
7
+ if [[ " $STATUS " == " false" ]]; then
8
+ echo " Development branch $BUILDKITE_BRANCH is not set as protected in GitHub but should be."
9
+ exit 1
10
+ fi
Original file line number Diff line number Diff line change 2
2
- job :
3
3
name : elastic+elasticsearch+%BRANCH%+branch-consistency
4
4
display-name : " elastic / elasticsearch # %BRANCH% - branch consistency"
5
- description : Testing of the Elasticsearch %BRANCH% branch version consistency.
6
- triggers :
7
- - timed : " H 7 * * * "
5
+ description : " This job has been migrated to Buildkite. \n "
6
+ disabled : true
7
+ triggers : []
8
8
builders :
9
9
- inject :
10
- properties-file : ' .ci/java-versions.properties'
10
+ properties-file : " .ci/java-versions.properties"
11
11
properties-content : |
12
12
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
13
13
- shell : |
Original file line number Diff line number Diff line change 2
2
- job :
3
3
name : elastic+elasticsearch+%BRANCH%+branch-protection
4
4
display-name : " elastic / elasticsearch # %BRANCH% - branch protection"
5
- description : Elasticsearch %BRANCH% branch protection.
5
+ description : " This job has been migrated to Buildkite.\n "
6
+ disabled : true
6
7
node : master
7
- triggers :
8
- - timed : " H 7 * * *"
8
+ triggers : []
9
9
scm : []
10
10
parameters : []
11
11
builders :
Original file line number Diff line number Diff line change @@ -31,5 +31,10 @@ if ! uname -a | grep -q MING; then
31
31
export GLIBC_VERSION=$( ldd --version | grep ' ^ldd' | sed ' s/.* \([1-9]\.[0-9]*\).*/\1/' )
32
32
fi
33
33
34
+ # Running on 2-core machines without ramdisk can make this value be 0
35
+ if [[ " $MAX_WORKERS " == " 0" ]]; then
36
+ MAX_WORKERS=1
37
+ fi
38
+
34
39
set -e
35
40
$GRADLEW -S --max-workers=$MAX_WORKERS $@
You can’t perform that action at this time.
0 commit comments