Skip to content

Commit cf1ac85

Browse files
committed
Merge branch 'develop'
2 parents ec96dd7 + 7e5a596 commit cf1ac85

File tree

363 files changed

+11239
-58293
lines changed

Some content is hidden

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

363 files changed

+11239
-58293
lines changed

.buildkite/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ steps:
66
echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
77
/usr/bin/ninja YOSEMITE_ut_coverage && \
88
echo "--- :arrow_up: Publishing Code Coverage Report" && \
9-
buildkite-agent artifact upload "YOSEMITE_ut_coverage/**/*" s3://eosio-coverage/$BUILDKITE_JOB_ID && \
9+
buildkite-agent artifact upload "YOSEMITE_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
1010
cp /config/.coveralls.yml . && \
1111
/usr/local/bin/coveralls-lcov EOSIO_ut_coverage_filtered.info && \
1212
echo "+++ View Report" && \
13-
printf "\033]1339;url=https://eosio-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
13+
printf "\033]1339;url=https://eos-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
1414
label: ":spiral_note_pad: Generate Report"
1515
agents:
16-
- "role=linux-coverage"
16+
queue: "automation-large-builder-fleet"
1717
plugins:
1818
docker#v1.4.0:
1919
image: "eosio/ci:ubuntu18"

.buildkite/debug.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ steps:
1919
tar -pczf build.tar.gz build/
2020
label: ":ubuntu: Build"
2121
agents:
22-
- "role=linux-builder"
22+
queue: "automation-large-builder-fleet"
2323
artifact_paths: "build.tar.gz"
2424
plugins:
25-
docker#v1.4.0:
25+
docker#v2.0.0:
2626
image: "eosio/ci:ubuntu"
2727
workdir: /data/job
2828
timeout: 60
@@ -34,10 +34,10 @@ steps:
3434
tar -pczf build.tar.gz build/
3535
label: ":ubuntu: 18.04 Build"
3636
agents:
37-
- "role=linux-builder"
37+
queue: "automation-large-builder-fleet"
3838
artifact_paths: "build.tar.gz"
3939
plugins:
40-
docker#v1.4.0:
40+
docker#v2.0.0:
4141
image: "eosio/ci:ubuntu18"
4242
workdir: /data/job
4343
timeout: 60
@@ -49,10 +49,10 @@ steps:
4949
tar -pczf build.tar.gz build/
5050
label: ":fedora: Build"
5151
agents:
52-
- "role=linux-builder"
52+
queue: "automation-large-builder-fleet"
5353
artifact_paths: "build.tar.gz"
5454
plugins:
55-
docker#v1.4.0:
55+
docker#v2.0.0:
5656
image: "eosio/ci:fedora"
5757
workdir: /data/job
5858
timeout: 60
@@ -64,10 +64,10 @@ steps:
6464
tar -pczf build.tar.gz build/
6565
label: ":centos: Build"
6666
agents:
67-
- "role=linux-builder"
67+
queue: "automation-large-builder-fleet"
6868
artifact_paths: "build.tar.gz"
6969
plugins:
70-
docker#v1.4.0:
70+
docker#v2.0.0:
7171
image: "eosio/ci:centos"
7272
workdir: /data/job
7373
timeout: 60
@@ -79,10 +79,10 @@ steps:
7979
tar -pczf build.tar.gz build/
8080
label: ":aws: Build"
8181
agents:
82-
- "role=linux-builder"
82+
queue: "automation-large-builder-fleet"
8383
artifact_paths: "build.tar.gz"
8484
plugins:
85-
docker#v1.4.0:
85+
docker#v2.0.0:
8686
image: "eosio/ci:amazonlinux"
8787
workdir: /data/job
8888
timeout: 60
@@ -122,13 +122,13 @@ steps:
122122
limit: 1
123123
label: ":ubuntu: Tests"
124124
agents:
125-
- "role=linux-tester"
125+
queue: "automation-large-builder-fleet"
126126
artifact_paths:
127127
- "mongod.log"
128128
- "build/genesis.json"
129129
- "build/config.ini"
130130
plugins:
131-
docker#v1.4.0:
131+
docker#v2.0.0:
132132
image: "eosio/ci:ubuntu"
133133
workdir: /data/job
134134
timeout: 60
@@ -146,13 +146,13 @@ steps:
146146
limit: 1
147147
label: ":ubuntu: 18.04 Tests"
148148
agents:
149-
- "role=linux-tester"
149+
queue: "automation-large-builder-fleet"
150150
artifact_paths:
151151
- "mongod.log"
152152
- "build/genesis.json"
153153
- "build/config.ini"
154154
plugins:
155-
docker#v1.4.0:
155+
docker#v2.0.0:
156156
image: "eosio/ci:ubuntu18"
157157
workdir: /data/job
158158
timeout: 60
@@ -170,13 +170,13 @@ steps:
170170
limit: 1
171171
label: ":fedora: Tests"
172172
agents:
173-
- "role=linux-tester"
173+
queue: "automation-large-builder-fleet"
174174
artifact_paths:
175175
- "mongod.log"
176176
- "build/genesis.json"
177177
- "build/config.ini"
178178
plugins:
179-
docker#v1.4.0:
179+
docker#v2.0.0:
180180
image: "eosio/ci:fedora"
181181
workdir: /data/job
182182
timeout: 60
@@ -194,13 +194,13 @@ steps:
194194
limit: 1
195195
label: ":centos: Tests"
196196
agents:
197-
- "role=linux-tester"
197+
queue: "automation-large-builder-fleet"
198198
artifact_paths:
199199
- "mongod.log"
200200
- "build/genesis.json"
201201
- "build/config.ini"
202202
plugins:
203-
docker#v1.4.0:
203+
docker#v2.0.0:
204204
image: "eosio/ci:centos"
205205
workdir: /data/job
206206
timeout: 60
@@ -218,13 +218,13 @@ steps:
218218
limit: 1
219219
label: ":aws: Tests"
220220
agents:
221-
- "role=linux-tester"
221+
queue: "automation-large-builder-fleet"
222222
artifact_paths:
223223
- "mongod.log"
224224
- "build/genesis.json"
225225
- "build/config.ini"
226226
plugins:
227-
docker#v1.4.0:
227+
docker#v2.0.0:
228228
image: "eosio/ci:amazonlinux"
229229
workdir: /data/job
230230
timeout: 60

.buildkite/docker.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
steps:
2+
- command: |
3+
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
4+
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
5+
docker-credential-gcr configure-docker && \
6+
echo "BUILDING BUILD IMAGE" && \
7+
cd Docker/builder && \
8+
docker build -t eosio/builder:latest -t eosio/builder:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_COMMIT && \
9+
docker tag eosio/builder:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
10+
docker tag eosio/builder:latest gcr.io/b1-automation-dev/eosio/builder:latest && \
11+
echo "PUSHING DOCKER IMAGES" && \
12+
docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
13+
docker push gcr.io/b1-automation-dev/eosio/builder:latest && \
14+
echo "TRASHING OLD IMAGES" && \
15+
docker rmi eosio/builder:$BUILDKITE_COMMIT && \
16+
docker rmi eosio/builder:latest && \
17+
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
18+
docker rmi gcr.io/b1-automation-dev/eosio/builder:latest
19+
label: "Docker build builder"
20+
agents:
21+
queue: "automation-docker-builder-fleet"
22+
timeout: 300
23+
24+
- wait
25+
26+
- command: |
27+
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
28+
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
29+
docker-credential-gcr configure-docker && \
30+
echo "BUILDING EOS IMAGE" && \
31+
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
32+
cd Docker && \
33+
docker build -t eosio/eos:latest -t eosio/eos:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
34+
docker tag eosio/eos:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
35+
docker tag eosio/eos:latest gcr.io/b1-automation-dev/eosio/eos:latest && \
36+
echo "PUSHING DOCKER IMAGES" && \
37+
docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
38+
docker push gcr.io/b1-automation-dev/eosio/eos:latest && \
39+
echo "TRASHING OLD IMAGES" && \
40+
docker rmi eosio/eos:$BUILDKITE_COMMIT && \
41+
docker rmi eosio/eos:latest && \
42+
docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
43+
docker rmi gcr.io/b1-automation-dev/eosio/eos:latest && \
44+
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
45+
label: "Docker build eos"
46+
agents:
47+
queue: "automation-docker-builder-fleet"
48+
timeout: 300
49+
50+
- command: |
51+
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
52+
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
53+
docker-credential-gcr configure-docker && \
54+
echo "BUILDING EOS DEV IMAGE" && \
55+
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
56+
cd Docker/dev && \
57+
docker build -t eosio/eos-dev:latest -t eosio/eos-dev:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
58+
docker tag eosio/eos-dev:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
59+
docker tag eosio/eos-dev:latest gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
60+
echo "PUSHING DOCKER IMAGES" && \
61+
docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
62+
docker push gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
63+
echo "TRASHING OLD IMAGES" && \
64+
docker rmi eosio/eos-dev:$BUILDKITE_COMMIT && \
65+
docker rmi eosio/eos-dev:latest && \
66+
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
67+
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
68+
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
69+
label: "Docker build eos-dev"
70+
agents:
71+
queue: "automation-docker-builder-fleet"
72+
timeout: 300
73+
74+
- wait

0 commit comments

Comments
 (0)