Skip to content

Commit b26260d

Browse files
bezalelbezalel
committed
Merge branch 'infrablockchain-2.3'
2 parents 8888efc + 5568d6d commit b26260d

File tree

790 files changed

+24566
-74965
lines changed

Some content is hidden

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

790 files changed

+24566
-74965
lines changed

‎.cicd/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,14 @@ Pipeline | Details
9494
[eosio-lrt](https://buildkite.com/EOSIO/eosio-lrt) | runs tests that need more time on merge commits
9595
[eosio-resume-from-state](https://buildkite.com/EOSIO/eosio-resume-from-state) | loads the current version of `nodeos` from state files generated by specific previous versions of `nodeos` in each [eosio](https://buildkite.com/EOSIO/eosio) build ([Documentation](https://github.com/EOSIO/auto-eks-sync-nodes/blob/master/pipelines/eosio-resume-from-state/README.md))
9696
[eosio-sync-from-genesis](https://buildkite.com/EOSIO/eosio-sync-from-genesis) | sync the current version of `nodeos` past genesis from peers on common public chains as a smoke test, for each [eosio](https://buildkite.com/EOSIO/eosio) build
97+
[eosio-test-stability](https://buildkite.com/EOSIO/eosio-test-stability) | prove or disprove test stability by running a test thousands of times
9798

9899
## See Also
99100
- Buildkite
100101
- [DevDocs](https://github.com/EOSIO/devdocs/wiki/Buildkite)
101102
- [eosio-resume-from-state Documentation](https://github.com/EOSIO/auto-eks-sync-nodes/blob/master/pipelines/eosio-resume-from-state/README.md)
102103
- [Run Your First Build](https://buildkite.com/docs/tutorials/getting-started#run-your-first-build)
104+
- [Stability Testing](https://github.com/EOSIO/eos/blob/HEAD/.cicd/eosio-test-stability.md)
103105
- [#help-automation](https://blockone.slack.com/archives/CMTAZ9L4D) Slack Channel
104106

105107
</details>

‎.cicd/base-images.yml‎

Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ steps:
1111
agents:
1212
queue: "automation-eks-eos-builder-fleet"
1313
timeout: 180
14+
skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
1415

1516
- label: ":centos: CentOS 7.7 - Base Image Pinned"
1617
command:
@@ -22,6 +23,7 @@ steps:
2223
agents:
2324
queue: "automation-eks-eos-builder-fleet"
2425
timeout: 180
26+
skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
2527

2628
- label: ":darwin: macOS 10.14 - Base Image Pinned"
2729
command:
@@ -45,29 +47,7 @@ steps:
4547
cd: ~
4648
agents: "queue=mac-anka-node-fleet"
4749
timeout: 180
48-
49-
- label: ":darwin: macOS 10.15 - Base Image Pinned"
50-
command:
51-
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
52-
- "cd eos && ./.cicd/platforms/pinned/macos-10.15-pinned.sh"
53-
plugins:
54-
- EOSIO/anka#v0.6.1:
55-
debug: true
56-
vm-name: "10.15.5_6C_14G_80G"
57-
no-volume: true
58-
always-pull: true
59-
wait-network: true
60-
pre-execute-sleep: 5
61-
pre-execute-ping-sleep: github.com
62-
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
63-
failover-registries:
64-
- "registry_1"
65-
- "registry_2"
66-
inherit-environment-vars: true
67-
- EOSIO/skip-checkout#v0.1.1:
68-
cd: ~
69-
agents: "queue=mac-anka-node-fleet"
70-
timeout: 180
50+
skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
7151

7252
- label: ":ubuntu: Ubuntu 16.04 - Base Image Pinned"
7353
command:
@@ -79,6 +59,7 @@ steps:
7959
agents:
8060
queue: "automation-eks-eos-builder-fleet"
8161
timeout: 180
62+
skip: ${SKIP_UBUNTU_16_04}${SKIP_LINUX}
8263

8364
- label: ":ubuntu: Ubuntu 18.04 - Base Image Pinned"
8465
command:
@@ -90,6 +71,7 @@ steps:
9071
agents:
9172
queue: "automation-eks-eos-builder-fleet"
9273
timeout: 180
74+
skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
9375

9476
- label: ":aws: Amazon_Linux 2 - Base Image Unpinned"
9577
command:
@@ -101,6 +83,7 @@ steps:
10183
agents:
10284
queue: "automation-eks-eos-builder-fleet"
10385
timeout: 180
86+
skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
10487

10588
- label: ":centos: CentOS 7.7 - Base Image Unpinned"
10689
command:
@@ -112,6 +95,7 @@ steps:
11295
agents:
11396
queue: "automation-eks-eos-builder-fleet"
11497
timeout: 180
98+
skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
11599

116100
- label: ":darwin: macOS 10.14 - Base Image Unpinned"
117101
command:
@@ -135,29 +119,7 @@ steps:
135119
cd: ~
136120
agents: "queue=mac-anka-node-fleet"
137121
timeout: 180
138-
139-
- label: ":darwin: macOS 10.15 - Base Image Unpinned"
140-
command:
141-
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
142-
- "cd eos && ./.cicd/platforms/unpinned/macos-10.15-unpinned.sh"
143-
plugins:
144-
- EOSIO/anka#v0.6.1:
145-
debug: true
146-
vm-name: "10.15.5_6C_14G_80G"
147-
no-volume: true
148-
always-pull: true
149-
wait-network: true
150-
pre-execute-sleep: 5
151-
pre-execute-ping-sleep: github.com
152-
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
153-
failover-registries:
154-
- "registry_1"
155-
- "registry_2"
156-
inherit-environment-vars: true
157-
- EOSIO/skip-checkout#v0.1.1:
158-
cd: ~
159-
agents: "queue=mac-anka-node-fleet"
160-
timeout: 180
122+
skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
161123

162124
- label: ":ubuntu: Ubuntu 18.04 - Base Image Unpinned"
163125
command:
@@ -168,4 +130,5 @@ steps:
168130
PLATFORM_TYPE: unpinned
169131
agents:
170132
queue: "automation-eks-eos-builder-fleet"
171-
timeout: 180
133+
timeout: 180
134+
skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}

‎.cicd/build-scripts.yml‎

Lines changed: 13 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ steps:
1010
command:
1111
- "./scripts/eosio_build.sh -P -y"
1212
timeout: 180
13+
skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
1314

1415
- label: ":centos: CentOS 7.7 - Build Pinned"
1516
plugins:
@@ -21,26 +22,16 @@ steps:
2122
command:
2223
- "./scripts/eosio_build.sh -P -y"
2324
timeout: 180
24-
25-
- label: ":centos: CentOS 8 - Build Pinned"
26-
plugins:
27-
- docker#v3.3.0:
28-
image: "centos:8"
29-
always-pull: true
30-
agents:
31-
queue: "automation-eks-eos-builder-fleet"
32-
command:
33-
- "./scripts/eosio_build.sh -P -y"
34-
timeout: 180
35-
25+
skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
26+
3627
- label: ":darwin: macOS 10.14 - Build Pinned"
3728
env:
3829
REPO: "[email protected]:EOSIO/eos.git"
3930
TEMPLATE: "10.14.6_6C_14G_80G"
4031
TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
41-
agents: "queue=mac-anka-large-node-fleet"
32+
agents: "queue=mac-anka-node-fleet"
4233
command:
43-
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
34+
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
4435
- "cd eos && ./scripts/eosio_build.sh -P -y"
4536
plugins:
4637
- EOSIO/anka#v0.6.1:
@@ -61,36 +52,7 @@ steps:
6152
- EOSIO/skip-checkout#v0.1.1:
6253
cd: ~
6354
timeout: 180
64-
65-
66-
- label: ":darwin: macOS 10.15 - Build Pinned"
67-
env:
68-
REPO: "[email protected]:EOSIO/eos.git"
69-
TEMPLATE: "10.15.5_6C_14G_80G"
70-
TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
71-
agents: "queue=mac-anka-large-node-fleet"
72-
command:
73-
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
74-
- "cd eos && ./scripts/eosio_build.sh -P -y"
75-
plugins:
76-
- EOSIO/anka#v0.6.1:
77-
debug: true
78-
vm-name: "10.15.5_6C_14G_80G"
79-
no-volume: true
80-
modify-cpu: 12
81-
modify-ram: 24
82-
always-pull: true
83-
wait-network: true
84-
pre-execute-sleep: 5
85-
pre-execute-ping-sleep: github.com
86-
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
87-
failover-registries:
88-
- "registry_1"
89-
- "registry_2"
90-
inherit-environment-vars: true
91-
- EOSIO/skip-checkout#v0.1.1:
92-
cd: ~
93-
timeout: 180
55+
skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
9456

9557
- label: ":ubuntu: Ubuntu 16.04 - Build Pinned"
9658
plugins:
@@ -103,6 +65,7 @@ steps:
10365
- "apt update && apt upgrade -y && apt install -y git"
10466
- "./scripts/eosio_build.sh -P -y"
10567
timeout: 180
68+
skip: ${SKIP_UBUNTU_16_04}${SKIP_LINUX}
10669

10770
- label: ":ubuntu: Ubuntu 18.04 - Build Pinned"
10871
plugins:
@@ -115,21 +78,7 @@ steps:
11578
- "apt update && apt upgrade -y && apt install -y git"
11679
- "./scripts/eosio_build.sh -P -y"
11780
timeout: 180
118-
119-
- label: ":ubuntu: Ubuntu 20.04 - Build Pinned"
120-
env:
121-
DEBIAN_FRONTEND: "noninteractive"
122-
plugins:
123-
- docker#v3.3.0:
124-
image: "ubuntu:20.04"
125-
always-pull: true
126-
agents:
127-
queue: "automation-eks-eos-builder-fleet"
128-
command:
129-
- "ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime"
130-
- "apt update && apt upgrade -y && apt install -y git"
131-
- "./scripts/eosio_build.sh -P -y"
132-
timeout: 180
81+
skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}
13382

13483
- label: ":aws: Amazon_Linux 2 - Build UnPinned"
13584
plugins:
@@ -141,6 +90,7 @@ steps:
14190
command:
14291
- "./scripts/eosio_build.sh -y"
14392
timeout: 180
93+
skip: ${SKIP_AMAZON_LINUX_2}${SKIP_LINUX}
14494

14595
- label: ":centos: CentOS 7.7 - Build UnPinned"
14696
plugins:
@@ -152,24 +102,14 @@ steps:
152102
command:
153103
- "./scripts/eosio_build.sh -y"
154104
timeout: 180
155-
156-
- label: ":centos: CentOS 8 - Build UnPinned"
157-
plugins:
158-
- docker#v3.3.0:
159-
image: "centos:8"
160-
always-pull: true
161-
agents:
162-
queue: "automation-eks-eos-builder-fleet"
163-
command:
164-
- "./scripts/eosio_build.sh -y"
165-
timeout: 180
105+
skip: ${SKIP_CENTOS_7_7}${SKIP_LINUX}
166106

167107
- label: ":darwin: macOS 10.14 - Build UnPinned"
168108
env:
169109
REPO: "[email protected]:EOSIO/eos.git"
170110
TEMPLATE: "10.14.6_6C_14G_80G"
171111
TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
172-
agents: "queue=mac-anka-large-node-fleet"
112+
agents: "queue=mac-anka-node-fleet"
173113
command:
174114
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
175115
- "cd eos && ./scripts/eosio_build.sh -y"
@@ -192,35 +132,7 @@ steps:
192132
- EOSIO/skip-checkout#v0.1.1:
193133
cd: ~
194134
timeout: 180
195-
196-
- label: ":darwin: macOS 10.15 - Build UnPinned"
197-
env:
198-
REPO: "[email protected]:EOSIO/eos.git"
199-
TEMPLATE: "10.15.5_6C_14G_80G"
200-
TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
201-
agents: "queue=mac-anka-large-node-fleet"
202-
command:
203-
- "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
204-
- "cd eos && ./scripts/eosio_build.sh -y"
205-
plugins:
206-
- EOSIO/anka#v0.6.1:
207-
debug: true
208-
vm-name: "10.15.5_6C_14G_80G"
209-
no-volume: true
210-
modify-cpu: 12
211-
modify-ram: 24
212-
always-pull: true
213-
wait-network: true
214-
pre-execute-sleep: 5
215-
pre-execute-ping-sleep: github.com
216-
vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
217-
failover-registries:
218-
- "registry_1"
219-
- "registry_2"
220-
inherit-environment-vars: true
221-
- EOSIO/skip-checkout#v0.1.1:
222-
cd: ~
223-
timeout: 180
135+
skip: ${SKIP_MACOS_10_14}${SKIP_MAC}
224136

225137
- label: ":ubuntu: Ubuntu 18.04 - Build UnPinned"
226138
plugins:
@@ -233,18 +145,4 @@ steps:
233145
- "apt update && apt upgrade -y && apt install -y git"
234146
- "./scripts/eosio_build.sh -y"
235147
timeout: 180
236-
237-
- label: ":ubuntu: Ubuntu 20.04 - Build UnPinned"
238-
env:
239-
DEBIAN_FRONTEND: "noninteractive"
240-
plugins:
241-
- docker#v3.3.0:
242-
image: "ubuntu:20.04"
243-
always-pull: true
244-
agents:
245-
queue: "automation-eks-eos-builder-fleet"
246-
command:
247-
- "ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime"
248-
- "apt update && apt upgrade -y && apt install -y git g++"
249-
- "./scripts/eosio_build.sh -y"
250-
timeout: 180
148+
skip: ${SKIP_UBUNTU_18_04}${SKIP_LINUX}

‎.cicd/build.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ set -eo pipefail
44
. ./.cicd/helpers/general.sh
55
mkdir -p "$BUILD_DIR"
66
[[ -z "$DCMAKE_BUILD_TYPE" ]] && export DCMAKE_BUILD_TYPE='Release'
7-
CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\""
7+
CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\" -DBUILD_MONGO_DB_PLUGIN=\"true\""
88
if [[ "$(uname)" == 'Darwin' && "$FORCE_LINUX" != 'true' ]]; then
99
# You can't use chained commands in execute
1010
if [[ "$GITHUB_ACTIONS" == 'true' ]]; then
1111
export PINNED='false'
1212
fi
1313
[[ ! "$PINNED" == 'false' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=\"$HELPERS_DIR/clang.make\""
1414
cd "$BUILD_DIR"
15-
[[ "$CI" == 'true' ]] && source ~/.bash_profile # Make sure node is available for ship_test
1615
echo '+++ :hammer_and_wrench: Building EOSIO'
1716
CMAKE_COMMAND="cmake $CMAKE_EXTRAS .."
1817
echo "$ $CMAKE_COMMAND"
@@ -30,14 +29,11 @@ else # Linux
3029
if [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
3130
CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER=\"clang++\" -DCMAKE_C_COMPILER=\"clang\""
3231
elif [[ "$IMAGE_TAG" == 'centos-7.7-unpinned' ]]; then
33-
PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable"
32+
PRE_COMMANDS="$PRE_COMMANDS && source \"/opt/rh/devtoolset-8/enable\" && source \"/opt/rh/rh-python36/enable\""
3433
CMAKE_EXTRAS="$CMAKE_EXTRAS -DLLVM_DIR=\"/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm\""
3534
elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
3635
CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER=\"clang++-7\" -DCMAKE_C_COMPILER=\"clang-7\" -DLLVM_DIR=\"/usr/lib/llvm-7/lib/cmake/llvm\""
3736
fi
38-
if [[ "$IMAGE_TAG" == centos-7.* ]]; then
39-
PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/rh-python36/enable"
40-
fi
4137
CMAKE_COMMAND="cmake \$CMAKE_EXTRAS .."
4238
MAKE_COMMAND="make -j $JOBS"
4339
BUILD_COMMANDS="echo \"+++ :hammer_and_wrench: Building EOSIO\" && echo \"$ $CMAKE_COMMAND\" && eval $CMAKE_COMMAND && echo \"$ $MAKE_COMMAND\" && eval $MAKE_COMMAND"

‎.cicd/create-docker-from-binary.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ echo "$ $DOCKER_BUILD"
1616
eval $DOCKER_BUILD
1717
# docker tag
1818
echo '--- :label: Tag Container'
19-
REGISTRIES=("$EOSIO_REGISTRY" "$DOCKERHUB_REGISTRY")
19+
if [[ "$BUILDKITE_PIPELINE_SLUG" =~ "-sec" ]] ; then
20+
REGISTRIES=("$EOSIO_REGISTRY")
21+
else
22+
REGISTRIES=("$EOSIO_REGISTRY" "$DOCKERHUB_REGISTRY")
23+
fi
2024
for REG in ${REGISTRIES[@]}; do
2125
DOCKER_TAG_BRANCH="docker tag '$IMAGE' '$REG:$SANITIZED_BRANCH'"
2226
echo "$ $DOCKER_TAG_BRANCH"

0 commit comments

Comments
 (0)