Merge pull request #10389 from EOSIO/merge-release-2.1.x-to-master

Merge release/2.1.x to master for v2.1.0

.cicd/README.md

@@ -0,0 +1,105 @@
+# eosio
+The [eosio](https://buildkite.com/EOSIO/eosio) and [eosio-build-unpinned](https://buildkite.com/EOSIO/eosio-build-unpinned) pipelines are the primary pipelines for the [eos](https://github.com/EOSIO/eos) repository, running with specific or default versions of our dependencies, respectively. Both run against every commit to a base branch or pull request, along with the [eosio-code-coverage](https://buildkite.com/EOSIO/eosio-code-coverage) pipeline.
+
+The [eosio](https://buildkite.com/EOSIO/eosio) pipeline further triggers the [eosio-sync-from-genesis](https://buildkite.com/EOSIO/eosio-sync-from-genesis) and [eosio-resume-from-state](https://buildkite.com/EOSIO/eosio-resume-from-state) pipelines on each build, and the the [eosio-lrt](https://buildkite.com/EOSIO/eosio-lrt) pipeline on merge commits. Each of these pipelines are described in more detail below and in their respective READMEs.
+
+<details>
+<summary>See More</summary>
+
+## Index
+1. [Configuration](README.md#configuration)
+   1. [Variables](README.md#variables)
+   1. [Examples](README.md#examples)
+1. [Pipelines](README.md#pipelines)
+1. [See Also](README.md#see-also)
+
+## Configuration
+Most EOSIO pipelines are run any time you push a commit or tag to an open pull request in [eos](https://github.com/EOSIO/eos), any time you merge a pull request, and nightly. The [eosio-lrt](https://buildkite.com/EOSIO/eosio-lrt) pipeline only runs when you merge a pull request because it takes so long. Long-running tests are also run in the [eosio](https://buildkite.com/EOSIO/eosio) nightly builds, which have `RUN_ALL_TESTS='true'` set.
+
+### Variables
+Most pipelines in the organization have several environment variables that can be used to configure how the pipeline runs. These environment variables can be specified when manually triggering a build via the Buildkite UI.
+
+Configure which platforms are run:
+```bash
+SKIP_LINUX='true|false'              # skip all steps on Linux distros
+SKIP_MAC='true|false'                # skip all steps on Mac hardware
+```
+These will override more specific operating system declarations, and primarily exist to disable one of our two buildfleets should one be sick or the finite macOS agents are congested.
+
+Configure which operating systems are built, tested, and packaged:
+```bash
+RUN_ALL_TESTS='true'                 # run all tests in the current build (including LRTs, overridden by SKIP* variables)
+SKIP_AMAZON_LINUX_2='true|false'     # skip all steps for Amazon Linux 2
+SKIP_CENTOS_7_7='true|false'         # skip all steps for Centos 7.7
+SKIP_CENTOS_8='true|false'           # skip all steps for Centos 8
+SKIP_MACOS_10_14='true|false'        # skip all steps for MacOS 10.14
+SKIP_MACOS_10_15='true|false'        # skip all steps for MacOS 10.15
+SKIP_MACOS_11='true|false'           # skip all steps for MacOS 11
+SKIP_UBUNTU_16_04='true|false'       # skip all steps for Ubuntu 16.04
+SKIP_UBUNTU_18_04='true|false'       # skip all steps for Ubuntu 18.04
+SKIP_UBUNTU_20_04='true|false'       # skip all steps for Ubuntu 20.04
+```
+
+Configure which steps are executed for each operating system:
+```bash
+SKIP_BUILD='true|false'              # skip all build steps
+SKIP_UNIT_TESTS='true|false'         # skip all unit tests
+SKIP_WASM_SPEC_TESTS='true|false'    # skip all wasm spec tests
+SKIP_SERIAL_TESTS='true|false'       # skip all integration tests
+SKIP_LONG_RUNNING_TESTS='true|false' # skip all long running tests
+SKIP_MULTIVERSION_TEST='true|false'  # skip all multiversion tests
+SKIP_SYNC_TESTS='true|false'         # skip all sync tests
+SKIP_PACKAGE_BUILDER='true|false'    # skip all packaging steps
+```
+
+Configure how the steps are executed:
+```bash
+PINNED='true|false'                  # use specific versions of dependencies instead of whatever version is provided by default on a given platform
+TIMEOUT='##'                         # set timeout in minutes for all steps
+```
+
+### Examples
+Build and test on Linux only:
+```bash
+SKIP_MAC='true'
+```
+
+Build and test on MacOS only:
+```bash
+SKIP_LINUX='true'
+```
+
+Skip all tests:
+```bash
+SKIP_UNIT_TESTS='true'
+SKIP_WASM_SPEC_TESTS='true'
+SKIP_SERIAL_TESTS='true'
+SKIP_LONG_RUNNING_TESTS='true'
+SKIP_MULTIVERSION_TEST='true'
+SKIP_SYNC_TESTS='true'
+```
+
+## Pipelines
+There are several eosio pipelines that exist and are triggered by pull requests, pipelines, or schedules:
+
+Pipeline | Details
+---|---
+[eosio](https://buildkite.com/EOSIO/eosio) | [eos](https://github.com/EOSIO/eos) build, tests, and packaging with pinned dependencies; runs on every pull request and base branch commit, and nightly
+[eosio-base-images](https://buildkite.com/EOSIO/eosio-base-images) | pack EOSIO dependencies into docker and Anka base-images nightly
+[eosio-big-sur-beta](https://buildkite.com/EOSIO/eosio-big-sur-beta) | build and test [eos](https://github.com/EOSIO/eos) on macOS 11 "Big Sur" weekly
+[eosio-build-scripts](https://buildkite.com/EOSIO/eosio-build-scripts) | run [eos](https://github.com/EOSIO/eos) build scripts nightly on empty operating systems
+[eosio-build-unpinned](https://buildkite.com/EOSIO/eosio-build-unpinned) | [eos](https://github.com/EOSIO/eos) build and tests with platform-provided dependencies; runs on every pull request and base branch commit, and nightly
+[eosio-code-coverage](https://buildkite.com/EOSIO/eosio-code-coverage) | assess [eos](https://github.com/EOSIO/eos) unit test coverage; runs on every pull request and base branch commit
+[eosio-debug-build](https://buildkite.com/EOSIO/eosio-debug-build) | perform a debug build for [eos](https://github.com/EOSIO/eos) on every pull request and base branch commit
+[eosio-lrt](https://buildkite.com/EOSIO/eosio-lrt) | runs tests that need more time on merge commits
+[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))
+[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
+
+## See Also
+- Buildkite
+  - [DevDocs](https://github.com/EOSIO/devdocs/wiki/Buildkite)
+  - [eosio-resume-from-state Documentation](https://github.com/EOSIO/auto-eks-sync-nodes/blob/master/pipelines/eosio-resume-from-state/README.md)
+  - [Run Your First Build](https://buildkite.com/docs/tutorials/getting-started#run-your-first-build)
+- [#help-automation](https://blockone.slack.com/archives/CMTAZ9L4D) Slack Channel
+
+</details>

.cicd/base-images.yml

@@ -45,6 +45,29 @@ steps:
           cd: ~
     agents: "queue=mac-anka-node-fleet"
     timeout: 180
+
+  - label: ":darwin: macOS 10.15 - Base Image Pinned"
+    command:
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
+      - "cd eos && ./.cicd/platforms/pinned/macos-10.15-pinned.sh"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.15.5_6C_14G_80G"
+          no-volume: true
+          always-pull: true
+          wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          failover-registries:
+          - "registry_1"
+          - "registry_2"
+          inherit-environment-vars: true
+      - EOSIO/skip-checkout#v0.1.1:
+          cd: ~
+    agents: "queue=mac-anka-node-fleet"
+    timeout: 180
 
   - label: ":ubuntu: Ubuntu 16.04 - Base Image Pinned"
     command:
@@ -112,6 +135,29 @@ steps:
           cd: ~
     agents: "queue=mac-anka-node-fleet"
     timeout: 180
+
+  - label: ":darwin: macOS 10.15 - Base Image Unpinned"
+    command:
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH"
+      - "cd eos && ./.cicd/platforms/unpinned/macos-10.15-unpinned.sh"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.15.5_6C_14G_80G"
+          no-volume: true
+          always-pull: true
+          wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          failover-registries:
+          - "registry_1"
+          - "registry_2"
+          inherit-environment-vars: true
+      - EOSIO/skip-checkout#v0.1.1:
+          cd: ~
+    agents: "queue=mac-anka-node-fleet"
+    timeout: 180
 
   - label: ":ubuntu: Ubuntu 18.04 - Base Image Unpinned"
     command:

.cicd/build-scripts.yml

@@ -21,15 +21,26 @@ steps:
     command:
       - "./scripts/eosio_build.sh -P -y"
     timeout: 180
-
+
+  - label: ":centos: CentOS 8 - Build Pinned"
+    plugins:
+      - docker#v3.3.0:
+          image: "centos:8"
+          always-pull: true
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    command:
+      - "./scripts/eosio_build.sh -P -y"
+    timeout: 180
+
   - label: ":darwin: macOS 10.14 - Build Pinned"
     env:
       REPO: "[email protected]:EOSIO/eos.git"
       TEMPLATE: "10.14.6_6C_14G_80G"
       TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
     agents: "queue=mac-anka-large-node-fleet"
     command:
-      - "git clone [email protected]:EOSIO/eos.git eos && cd eos && git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos &&  git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
       - "cd eos && ./scripts/eosio_build.sh -P -y"
     plugins:
       - EOSIO/anka#v0.6.1:
@@ -50,6 +61,36 @@ steps:
       - EOSIO/skip-checkout#v0.1.1:
           cd: ~
     timeout: 180
+
+
+  - label: ":darwin: macOS 10.15 - Build Pinned"
+    env:
+      REPO: "[email protected]:EOSIO/eos.git"
+      TEMPLATE: "10.15.5_6C_14G_80G"
+      TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+    agents: "queue=mac-anka-large-node-fleet"
+    command:
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos &&  git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
+      - "cd eos && ./scripts/eosio_build.sh -P -y"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.15.5_6C_14G_80G"
+          no-volume: true
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          failover-registries:
+          - "registry_1"
+          - "registry_2"
+          inherit-environment-vars: true
+      - EOSIO/skip-checkout#v0.1.1:
+          cd: ~
+    timeout: 180
 
   - label: ":ubuntu: Ubuntu 16.04 - Build Pinned"
     plugins:
@@ -75,6 +116,21 @@ steps:
       - "./scripts/eosio_build.sh -P -y"
     timeout: 180
 
+  - label: ":ubuntu: Ubuntu 20.04 - Build Pinned"
+    env:
+      DEBIAN_FRONTEND: "noninteractive" 
+    plugins:
+      - docker#v3.3.0:
+          image: "ubuntu:20.04"
+          always-pull: true
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    command:
+      - "ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime"
+      - "apt update && apt upgrade -y && apt install -y git"
+      - "./scripts/eosio_build.sh -P -y"
+    timeout: 180
+
   - label: ":aws: Amazon_Linux 2 - Build UnPinned"
     plugins:
       - docker#v3.3.0:
@@ -96,6 +152,17 @@ steps:
     command:
       - "./scripts/eosio_build.sh -y"
     timeout: 180
+
+  - label: ":centos: CentOS 8 - Build UnPinned"
+    plugins:
+      - docker#v3.3.0:
+          image: "centos:8"
+          always-pull: true
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    command:
+      - "./scripts/eosio_build.sh -y"
+    timeout: 180
 
   - label: ":darwin: macOS 10.14 - Build UnPinned"
     env:
@@ -125,6 +192,35 @@ steps:
       - EOSIO/skip-checkout#v0.1.1:
           cd: ~
     timeout: 180
+
+  - label: ":darwin: macOS 10.15 - Build UnPinned"
+    env:
+      REPO: "[email protected]:EOSIO/eos.git"
+      TEMPLATE: "10.15.5_6C_14G_80G"
+      TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+    agents: "queue=mac-anka-large-node-fleet"
+    command:
+      - "git clone [email protected]:EOSIO/eos.git eos && cd eos &&  git checkout -f $BUILDKITE_BRANCH && git submodule update --init --recursive"
+      - "cd eos && ./scripts/eosio_build.sh -y"
+    plugins:
+      - EOSIO/anka#v0.6.1:
+          debug: true
+          vm-name: "10.15.5_6C_14G_80G"
+          no-volume: true
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          wait-network: true
+          pre-execute-sleep: 5
+          pre-execute-ping-sleep: github.com
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          failover-registries:
+          - "registry_1"
+          - "registry_2"
+          inherit-environment-vars: true
+      - EOSIO/skip-checkout#v0.1.1:
+          cd: ~
+    timeout: 180
 
   - label: ":ubuntu: Ubuntu 18.04 - Build UnPinned"
     plugins:
@@ -136,4 +232,19 @@ steps:
     command:
       - "apt update && apt upgrade -y && apt install -y git"
       - "./scripts/eosio_build.sh -y"
-    timeout: 180
+    timeout: 180
+
+  - label: ":ubuntu: Ubuntu 20.04 - Build UnPinned"
+    env:
+      DEBIAN_FRONTEND: "noninteractive" 
+    plugins:
+      - docker#v3.3.0:
+          image: "ubuntu:20.04"
+          always-pull: true
+    agents:
+      queue: "automation-eks-eos-builder-fleet"
+    command:
+      - "ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime"
+      - "apt update && apt upgrade -y && apt install -y git g++"
+      - "./scripts/eosio_build.sh -y"
+    timeout: 180

.cicd/build.sh

@@ -4,14 +4,15 @@ set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p "$BUILD_DIR"
 [[ -z "$DCMAKE_BUILD_TYPE" ]] && export DCMAKE_BUILD_TYPE='Release'
-CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\" -DBUILD_MONGO_DB_PLUGIN=\"true\""
+CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\""
 if [[ "$(uname)" == 'Darwin' && "$FORCE_LINUX" != 'true' ]]; then
     # You can't use chained commands in execute
     if [[ "$GITHUB_ACTIONS" == 'true' ]]; then
         export PINNED='false'
     fi
     [[ ! "$PINNED" == 'false' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=\"$HELPERS_DIR/clang.make\""
     cd "$BUILD_DIR"
+    [[ "$CI" == 'true' ]] && source ~/.bash_profile # Make sure node is available for ship_test
     echo '+++ :hammer_and_wrench: Building EOSIO'
     CMAKE_COMMAND="cmake $CMAKE_EXTRAS .."
     echo "$ $CMAKE_COMMAND"
@@ -29,11 +30,14 @@ else # Linux
     if [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER=\"clang++\" -DCMAKE_C_COMPILER=\"clang\""
     elif [[ "$IMAGE_TAG" == 'centos-7.7-unpinned' ]]; then
-        PRE_COMMANDS="$PRE_COMMANDS && source \"/opt/rh/devtoolset-8/enable\" && source \"/opt/rh/rh-python36/enable\""
+        PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DLLVM_DIR=\"/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm\""
     elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER=\"clang++-7\" -DCMAKE_C_COMPILER=\"clang-7\" -DLLVM_DIR=\"/usr/lib/llvm-7/lib/cmake/llvm\""
     fi
+    if [[ "$IMAGE_TAG" == centos-7.* ]]; then
+        PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/rh-python36/enable"
+    fi
     CMAKE_COMMAND="cmake \$CMAKE_EXTRAS .."
     MAKE_COMMAND="make -j $JOBS"
     BUILD_COMMANDS="echo \"+++ :hammer_and_wrench: Building EOSIO\" && echo \"$ $CMAKE_COMMAND\" && eval $CMAKE_COMMAND && echo \"$ $MAKE_COMMAND\" && eval $MAKE_COMMAND"