File tree Expand file tree Collapse file tree 7 files changed +46
-11
lines changed Expand file tree Collapse file tree 7 files changed +46
-11
lines changed Original file line number Diff line number Diff line change @@ -14,15 +14,15 @@ 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
- group : bwc-snapshots
28
28
steps :
Original file line number Diff line number Diff line change 42
42
agents :
43
43
provider : gcp
44
44
image : family/elasticsearch-ubuntu-2004
45
- machineType : custom-32-98304
45
+ machineType : n1-standard-32
46
46
buildDirectory : /dev/shm/bk
47
47
env :
48
48
ES_RUNTIME_JAVA : " {{matrix.ES_RUNTIME_JAVA}}"
70
70
agents :
71
71
provider : gcp
72
72
image : family/elasticsearch-ubuntu-2004
73
- machineType : custom-32-98304
73
+ machineType : n1-standard-32
74
74
buildDirectory : /dev/shm/bk
75
75
env :
76
76
ES_RUNTIME_JAVA : " {{matrix.ES_RUNTIME_JAVA}}"
@@ -159,3 +159,13 @@ steps:
159
159
image : family/elasticsearch-ubuntu-2004
160
160
machineType : n2-standard-8
161
161
buildDirectory : /dev/shm/bk
162
+ - label : Check branch consistency
163
+ command : .ci/scripts/run-gradle.sh branchConsistency
164
+ timeout_in_minutes : 15
165
+ agents :
166
+ provider : gcp
167
+ image : family/elasticsearch-ubuntu-2004
168
+ machineType : n2-standard-2
169
+ - label : Check branch protection rules
170
+ command : .buildkite/scripts/branch-protection.sh
171
+ timeout_in_minutes : 5
Original file line number Diff line number Diff line change @@ -1350,3 +1350,13 @@ steps:
1350
1350
image : family/elasticsearch-ubuntu-2004
1351
1351
machineType : n2-standard-8
1352
1352
buildDirectory : /dev/shm/bk
1353
+ - label : Check branch consistency
1354
+ command : .ci/scripts/run-gradle.sh branchConsistency
1355
+ timeout_in_minutes : 15
1356
+ agents :
1357
+ provider : gcp
1358
+ image : family/elasticsearch-ubuntu-2004
1359
+ machineType : n2-standard-2
1360
+ - label : Check branch protection rules
1361
+ command : .buildkite/scripts/branch-protection.sh
1362
+ 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