This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8203 from EOSIO/merge-release-1.8.6-to-master
Merge release 1.8.6 to master
- Loading branch information
Showing
24 changed files
with
212 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,18 +14,20 @@ if [[ $BUILDKITE_BRANCH =~ ^pull/[0-9]+/head: ]]; then | |
| fi | ||
|
|
||
| [[ -z "$ROUNDS" ]] && export ROUNDS='1' | ||
| # read .cicd/platforms | ||
| for FILE in $(ls $CICD_DIR/platforms); do | ||
| # Determine which dockerfiles/scripts to use for the pipeline. | ||
| if [[ $PINNED == false ]]; then | ||
| export PLATFORM_TYPE="unpinned" | ||
| else | ||
| export PLATFORM_TYPE="pinned" | ||
| fi | ||
| for FILE in $(ls $CICD_DIR/platforms/$PLATFORM_TYPE); do | ||
| # skip mac or linux by not even creating the json block | ||
| ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue | ||
| ( [[ $SKIP_LINUX == true ]] && [[ ! $FILE =~ 'macos' ]] ) && continue | ||
| # use pinned or unpinned, not both sets of platform files | ||
| if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then | ||
| if [[ $PINNED == false ]]; then | ||
| export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true} | ||
| export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true} | ||
| [[ ! $FILE =~ 'unpinned' ]] && continue | ||
| else | ||
| [[ $FILE =~ 'unpinned' ]] && continue | ||
| fi | ||
| export FILE_NAME="$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')" | ||
| # macos-10.14 | ||
|
|
@@ -54,7 +56,7 @@ for FILE in $(ls $CICD_DIR/platforms); do | |
| [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:' | ||
| [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:' | ||
| [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:' | ||
| . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc | ||
| . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$FILE # returns HASHED_IMAGE_TAG, etc | ||
| export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ | ||
| "FILE_NAME": env.FILE_NAME, | ||
| "PLATFORM_NAME": env.PLATFORM_NAME, | ||
|
|
@@ -94,7 +96,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do | |
| - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz" | ||
| env: | ||
| IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| agents: | ||
| queue: "$BUILDKITE_BUILD_AGENT_QUEUE" | ||
| timeout: ${TIMEOUT:-180} | ||
|
|
@@ -122,17 +124,17 @@ EOF | |
| failover-registries: | ||
| - 'registry_1' | ||
| - 'registry_2' | ||
| pre-execute-sleep: 5 | ||
| pre-execute-sleep: 10 | ||
| pre-commands: | ||
| - "git clone [email protected]:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'" | ||
| env: | ||
| REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} | ||
| REPO_COMMIT: $BUILDKITE_COMMIT | ||
| TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME | ||
| TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE | ||
| PINNED: $PINNED | ||
| UNPINNED: $UNPINNED | ||
| TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos" | ||
| IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export IMAGE_TAG=$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) && export PLATFORM_TYPE=$PLATFORM_TYPE && . ./.cicd/platforms/$PLATFORM_TYPE/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos" | ||
| PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG) | ||
| timeout: ${TIMEOUT:-180} | ||
| agents: "queue=mac-anka-large-node-fleet" | ||
|
|
@@ -158,7 +160,7 @@ for ROUND in $(seq 1 $ROUNDS); do | |
| - "./.cicd/test.sh scripts/parallel-test.sh" | ||
| env: | ||
| IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| agents: | ||
| queue: "$BUILDKITE_BUILD_AGENT_QUEUE" | ||
| timeout: ${TIMEOUT:-10} | ||
|
|
@@ -184,7 +186,7 @@ EOF | |
| failover-registries: | ||
| - 'registry_1' | ||
| - 'registry_2' | ||
| pre-execute-sleep: 5 | ||
| pre-execute-sleep: 10 | ||
| timeout: ${TIMEOUT:-60} | ||
| agents: "queue=mac-anka-node-fleet" | ||
| skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS} | ||
|
|
@@ -206,7 +208,7 @@ EOF | |
| - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME" | ||
| env: | ||
| IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| agents: | ||
| queue: "$BUILDKITE_TEST_AGENT_QUEUE" | ||
| timeout: ${TIMEOUT:-20} | ||
|
|
@@ -232,7 +234,7 @@ EOF | |
| failover-registries: | ||
| - 'registry_1' | ||
| - 'registry_2' | ||
| pre-execute-sleep: 5 | ||
| pre-execute-sleep: 10 | ||
| timeout: ${TIMEOUT:-60} | ||
| agents: "queue=mac-anka-node-fleet" | ||
| skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS} | ||
|
|
@@ -256,7 +258,7 @@ EOF | |
| - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME" | ||
| env: | ||
| IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| agents: | ||
| queue: "$BUILDKITE_TEST_AGENT_QUEUE" | ||
| timeout: ${TIMEOUT:-180} | ||
|
|
@@ -282,7 +284,7 @@ EOF | |
| failover-registries: | ||
| - 'registry_1' | ||
| - 'registry_2' | ||
| pre-execute-sleep: 5 | ||
| pre-execute-sleep: 10 | ||
| timeout: ${TIMEOUT:-180} | ||
| agents: "queue=mac-anka-node-fleet" | ||
| skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true} | ||
|
|
@@ -300,7 +302,7 @@ EOF | |
| done | ||
| # trigger eosio-lrt post pr | ||
| if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then | ||
| if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then | ||
| if ( [[ ! $PINNED == false ]] ); then | ||
| cat <<EOF | ||
| - label: ":pipeline: Trigger Long Running Tests" | ||
| trigger: "eosio-lrt" | ||
|
|
@@ -315,14 +317,13 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then | |
| BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}" | ||
| SKIP_BUILD: "true" | ||
| PINNED: "${PINNED}" | ||
| UNPINNED: "${UNPINNED}" | ||
| EOF | ||
| fi | ||
| fi | ||
| # trigger multiversion post pr | ||
| if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then | ||
| if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then | ||
| if ( [[ ! $PINNED == false ]] ); then | ||
| cat <<EOF | ||
| - label: ":pipeline: Trigger Multiversion Test" | ||
| trigger: "eos-multiversion-tests" | ||
|
|
@@ -363,8 +364,8 @@ cat <<EOF | |
| - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz" | ||
| - "./.cicd/package.sh" | ||
| env: | ||
| IMAGE_TAG: "centos-7.6" | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| IMAGE_TAG: "centos-7.6-$PLATFORM_TYPE" | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| OS: "el7" # OS and PKGTYPE required for lambdas | ||
| PKGTYPE: "rpm" | ||
| agents: | ||
|
|
@@ -377,8 +378,8 @@ cat <<EOF | |
| - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz" | ||
| - "./.cicd/package.sh" | ||
| env: | ||
| IMAGE_TAG: "ubuntu-16.04" | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| IMAGE_TAG: "ubuntu-16.04-$PLATFORM_TYPE" | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas | ||
| PKGTYPE: "deb" | ||
| agents: | ||
|
|
@@ -391,8 +392,8 @@ cat <<EOF | |
| - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz" | ||
| - "./.cicd/package.sh" | ||
| env: | ||
| IMAGE_TAG: "ubuntu-18.04" | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| IMAGE_TAG: "ubuntu-18.04-$PLATFORM_TYPE" | ||
| PLATFORM_TYPE: $PLATFORM_TYPE | ||
| OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas | ||
| PKGTYPE: "deb" | ||
| agents: | ||
|
|
@@ -417,7 +418,7 @@ cat <<EOF | |
| failover-registries: | ||
| - 'registry_1' | ||
| - 'registry_2' | ||
| pre-execute-sleep: 5 | ||
| pre-execute-sleep: 10 | ||
| agents: | ||
| - "queue=mac-anka-node-fleet" | ||
| timeout: ${TIMEOUT:-60} | ||
|
|
@@ -427,7 +428,7 @@ cat <<EOF | |
| command: "./.cicd/installation-build.sh" | ||
| env: | ||
| IMAGE_TAG: "ubuntu-18.04-unpinned" | ||
| BUILDKITE_AGENT_ACCESS_TOKEN: | ||
| PLATFORM_TYPE: "unpinned" | ||
| agents: | ||
| queue: "$BUILDKITE_BUILD_AGENT_QUEUE" | ||
| timeout: ${TIMEOUT:-30} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.