From 497c98e81e8563d980419f761b8f92b110fe4c66 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Wed, 23 Oct 2019 16:56:00 -0400 Subject: [PATCH 01/18] Test envs related to cloning. --- .cicd/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 900aea633e0..1a6a12c3662 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -6,6 +6,8 @@ steps: - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" - "buildkite-agent artifact upload generated-pipeline.yml" + env: + BUILDKITE_DISABLE_GIT_SUBMODULES: true agents: queue: "automation-basic-builder-fleet" timeout: ${TIMEOUT:-10} \ No newline at end of file From d3c2f57cdbaa59d25666258ee53b42875fbabbce Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:07:20 -0400 Subject: [PATCH 02/18] Test plugin. --- .cicd/pipeline.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 1a6a12c3662..2ebdfe1e75f 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,11 +3,19 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - - "buildkite-agent pipeline upload < generated-pipeline.yml" - - "buildkite-agent artifact upload generated-pipeline.yml" - env: - BUILDKITE_DISABLE_GIT_SUBMODULES: true + - "ls -la && pwd" + plugins: + thedyrt/skip-checkout#v0.1.1: + cd: ~ agents: queue: "automation-basic-builder-fleet" - timeout: ${TIMEOUT:-10} \ No newline at end of file + timeout: ${TIMEOUT:-10} + + # - label: ":pipeline: Generate Pipeline Steps" + # command: + # - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" + # - "buildkite-agent pipeline upload < generated-pipeline.yml" + # - "buildkite-agent artifact upload generated-pipeline.yml" + # agents: + # queue: "automation-basic-builder-fleet" + # timeout: ${TIMEOUT:-10} \ No newline at end of file From 3971b25e14ef4e771e4698e4f3eac115c40d953d Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:20:42 -0400 Subject: [PATCH 03/18] Test single branch clone. --- .cicd/pipeline.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 2ebdfe1e75f..39d536ef84a 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,7 +3,10 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - - "ls -la && pwd" + - "git clone https://github.com/EOSIO/eos -b conan-poc-v2 --single-branch ." + - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" + - "buildkite-agent pipeline upload < generated-pipeline.yml" + - "buildkite-agent artifact upload generated-pipeline.yml" plugins: thedyrt/skip-checkout#v0.1.1: cd: ~ From 5d9e59af6c7c84ea333e70ef41b77c406ab00f1a Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:23:40 -0400 Subject: [PATCH 04/18] Set to proper branch and commit. --- .cicd/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 39d536ef84a..d5410608594 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,7 +3,8 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - - "git clone https://github.com/EOSIO/eos -b conan-poc-v2 --single-branch ." + - "git clone https://github.com/EOSIO/eos -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" - "buildkite-agent artifact upload generated-pipeline.yml" From 235c0e603818e85290e17259cbedd47fc13ad87b Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:28:11 -0400 Subject: [PATCH 05/18] Limit clones on more steps. --- .cicd/generate-pipeline.sh | 17 +++++++++++++++++ .cicd/pipeline.yml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index a9062047f50..ffe20ba5854 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -457,6 +457,9 @@ cat < Date: Fri, 25 Oct 2019 10:29:57 -0400 Subject: [PATCH 06/18] Limit clones on more steps. --- .cicd/generate-pipeline.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index ffe20ba5854..327ec22e2de 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -209,6 +209,8 @@ EOF - 'registry_1' - 'registry_2' pre-execute-sleep: 5 + - thedyrt/skip-checkout#v0.1.1: + cd: ~ 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} @@ -265,6 +267,8 @@ EOF - 'registry_1' - 'registry_2' pre-execute-sleep: 5 + - thedyrt/skip-checkout#v0.1.1: + cd: ~ 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_WASM_SPEC_TESTS} @@ -324,6 +328,8 @@ EOF - 'registry_1' - 'registry_2' pre-execute-sleep: 5 + - thedyrt/skip-checkout#v0.1.1: + cd: ~ 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} @@ -384,6 +390,8 @@ EOF - 'registry_1' - 'registry_2' pre-execute-sleep: 5 + - thedyrt/skip-checkout#v0.1.1: + cd: ~ 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} From a2960785b766759b13ba7e67d5c7992fe4d8887a Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:31:47 -0400 Subject: [PATCH 07/18] Merge develop, skip checkout on Mac build. --- .cicd/generate-pipeline.sh | 2 ++ .cicd/pipeline.yml | 11 +---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index b46b1775ab9..a720c43c6e1 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -133,6 +133,8 @@ EOF pre-execute-sleep: 5 pre-commands: - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'" + - thedyrt/skip-checkout#v0.1.1: + cd: ~ env: REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} REPO_COMMIT: $BUILDKITE_COMMIT diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 0fd37f729f7..04ea7c4f68e 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -13,13 +13,4 @@ steps: cd: ~ agents: queue: "automation-basic-builder-fleet" - timeout: ${TIMEOUT:-10} - - # - label: ":pipeline: Generate Pipeline Steps" - # command: - # - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - # - "buildkite-agent pipeline upload < generated-pipeline.yml" - # - "buildkite-agent artifact upload generated-pipeline.yml" - # agents: - # queue: "automation-basic-builder-fleet" - # timeout: ${TIMEOUT:-10} \ No newline at end of file + timeout: ${TIMEOUT:-10} \ No newline at end of file From 916091f21801c8ef1ad7058dcbd768fd8f592acb Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:44:39 -0400 Subject: [PATCH 08/18] Speed things up more? --- .cicd/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 04ea7c4f68e..d1cdd466af8 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,8 +3,8 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - - "git clone https://github.com/EOSIO/eos -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch --depth 2 --filter=blob:none ." + - "git checkout $BUILDKITE_COMMIT -- .cicd" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" - "buildkite-agent artifact upload generated-pipeline.yml" From ca08362aa425491bf6fa0451f94cbc60bfa47ec7 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:48:07 -0400 Subject: [PATCH 09/18] Speed things up more? --- .cicd/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index d1cdd466af8..ffdd9aea358 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,7 +3,7 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch --depth 2 --filter=blob:none ." + - "git clone https://github.com/EOSIO/eos -b $BUILDKITE_BRANCH --single-branch --depth 2 --filter=blob:none ." - "git checkout $BUILDKITE_COMMIT -- .cicd" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" From 0fc3c0754999cc99975ce8095f88eb8e9c1c2c3b Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:56:43 -0400 Subject: [PATCH 10/18] Fix for clone prompt? --- .cicd/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index ffdd9aea358..3eb0a6ecac0 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -3,6 +3,7 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: + - "ssh-keyscan -H github.com >> ~/.ssh/known_hosts" - "git clone https://github.com/EOSIO/eos -b $BUILDKITE_BRANCH --single-branch --depth 2 --filter=blob:none ." - "git checkout $BUILDKITE_COMMIT -- .cicd" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" From 393d504399eb418bc5f2b73206cb27bbbaa78ce8 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 10:59:43 -0400 Subject: [PATCH 11/18] Fix for clone prompt? --- .cicd/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index 3eb0a6ecac0..bb7e5d219c7 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -4,8 +4,8 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - "ssh-keyscan -H github.com >> ~/.ssh/known_hosts" - - "git clone https://github.com/EOSIO/eos -b $BUILDKITE_BRANCH --single-branch --depth 2 --filter=blob:none ." - - "git checkout $BUILDKITE_COMMIT -- .cicd" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" - "buildkite-agent artifact upload generated-pipeline.yml" From 9f3dd4741ee798514af09ccc2b07cfa85666008f Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 11:29:32 -0400 Subject: [PATCH 12/18] Fix for other clone skips. --- .cicd/generate-pipeline.sh | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index a720c43c6e1..64bbc272897 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -457,11 +457,14 @@ cat <> ~/.ssh/known_hosts" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" + - "echo '+++ :compression: Extracting Test Metrics Code'" + - "tar -zxf .cicd/metrics/test-metrics.tar.gz" + - "echo '+++ :javascript: Running test-metrics.js'" + - "node --max-old-space-size=32768 test-metrics.js" plugins: - thedyrt/skip-checkout#v0.1.1: cd: ~ @@ -475,6 +478,9 @@ cat <> ~/.ssh/known_hosts" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" - "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" plugins: @@ -492,6 +498,9 @@ cat <> ~/.ssh/known_hosts" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" - "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" plugins: @@ -509,6 +518,9 @@ cat <> ~/.ssh/known_hosts" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" - "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" plugins: @@ -568,9 +580,12 @@ cat <> ~/.ssh/known_hosts" + - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." + - "git checkout $BUILDKITE_COMMIT" + - "buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'" + - "buildkite-agent artifact upload eosio.rb" plugins: - thedyrt/skip-checkout#v0.1.1: cd: ~ From 63cf67282c309a8a855b8ed6cbc644fbb479eba9 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 25 Oct 2019 14:13:07 -0400 Subject: [PATCH 13/18] Working to fix forked PRs. --- .cicd/generate-pipeline.sh | 20 ++++++++++---------- .cicd/pipeline.yml | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 64bbc272897..455b722255f 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -459,8 +459,8 @@ cat <> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "echo '+++ :compression: Extracting Test Metrics Code'" - "tar -zxf .cicd/metrics/test-metrics.tar.gz" - "echo '+++ :javascript: Running test-metrics.js'" @@ -479,8 +479,8 @@ cat <> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "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" plugins: @@ -499,8 +499,8 @@ cat <> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "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" plugins: @@ -519,8 +519,8 @@ cat <> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "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" plugins: @@ -582,8 +582,8 @@ cat <> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'" - "buildkite-agent artifact upload eosio.rb" plugins: diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml index bb7e5d219c7..e1460f9c7de 100644 --- a/.cicd/pipeline.yml +++ b/.cicd/pipeline.yml @@ -4,8 +4,9 @@ steps: - label: ":pipeline: Generate Pipeline Steps" command: - "ssh-keyscan -H github.com >> ~/.ssh/known_hosts" - - "git clone $BUILDKITE_REPO -b $BUILDKITE_BRANCH --single-branch ." - - "git checkout $BUILDKITE_COMMIT" + - "git clone $BUILDKITE_REPO ." + - "[[ $BUILDKITE_BRANCH =~ ^pull/[0-9]+/head: ]] && git fetch -v --prune origin refs/pull/$(echo $BUILDKITE_BRANCH | cut -d/ -f2)/head" + - "git checkout -f $BUILDKITE_COMMIT" - "./.cicd/generate-pipeline.sh > generated-pipeline.yml" - "buildkite-agent pipeline upload < generated-pipeline.yml" - "buildkite-agent artifact upload generated-pipeline.yml" From 3a5695a4da820091b08b0e1a450d60c7ee53b77a Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Mon, 28 Oct 2019 10:18:21 -0400 Subject: [PATCH 14/18] Attempt to limit clone on serial test and lrt steps. --- .cicd/generate-pipeline.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 455b722255f..081f6d66017 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -294,6 +294,9 @@ EOF command: - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz" - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME" + plugins: + - thedyrt/skip-checkout#v0.1.1: + cd: ~ env: IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) BUILDKITE_AGENT_ACCESS_TOKEN: @@ -356,6 +359,9 @@ EOF command: - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz" - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME" + plugins: + - thedyrt/skip-checkout#v0.1.1: + cd: ~ env: IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) BUILDKITE_AGENT_ACCESS_TOKEN: From 8dde2d14887abe0d4f566570cbf9f489c0a5bcb9 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Mon, 28 Oct 2019 10:39:42 -0400 Subject: [PATCH 15/18] Attempt to limit clone on serial test and lrt steps. --- .cicd/generate-pipeline.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 081f6d66017..37c33cdb0f6 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -292,6 +292,9 @@ EOF cat <> ~/.ssh/known_hosts" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz" - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME" plugins: @@ -357,6 +360,9 @@ EOF cat <> ~/.ssh/known_hosts" + - "git clone \$BUILDKITE_REPO ." + - "$GIT_FETCH git checkout -f \$BUILDKITE_COMMIT" - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz" - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME" plugins: From 7f3f134442abcf4b6e551e29555fd33493a1d105 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Wed, 30 Oct 2019 13:09:32 -0400 Subject: [PATCH 16/18] DISABLE_CONCURRENCY --- .cicd/generate-pipeline.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 37c33cdb0f6..f32d8b225f0 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -149,7 +149,7 @@ EOF 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_BUILD} EOF fi - if [ "$BUILDKITE_SOURCE" = "schedule" ]; then + if [ "$BUILDKITE_SOURCE" = "schedule" ] || [[ $DISABLE_CONCURRENCY == true ]]; then cat < Date: Fri, 1 Nov 2019 11:47:16 -0400 Subject: [PATCH 17/18] Support for disabled concurrency on scheduled builds --- .cicd/generate-pipeline.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index f32d8b225f0..5a26ff6faf5 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -6,6 +6,7 @@ export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas:: export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.6_6C_14G_40G'} export PLATFORMS_JSON_ARRAY='[]' [[ -z "$ROUNDS" ]] && export ROUNDS='1' +DISABLE_CONCURRENCY=${DISABLE_CONCURRENCY:-false} LINUX_CONCURRENCY='8' MAC_CONCURRENCY='2' LINUX_CONCURRENCY_GROUP='eos-scheduled-build' @@ -132,7 +133,7 @@ EOF - 'registry_2' pre-execute-sleep: 5 pre-commands: - - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'" + - "rm -rf mac-anka-fleet; git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'" - thedyrt/skip-checkout#v0.1.1: cd: ~ env: @@ -149,7 +150,7 @@ EOF 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_BUILD} EOF fi - if [ "$BUILDKITE_SOURCE" = "schedule" ] || [[ $DISABLE_CONCURRENCY == true ]]; then + if [ "$BUILDKITE_SOURCE" = "schedule" ] && [[ $DISABLE_CONCURRENCY != true ]]; then cat < Date: Mon, 4 Nov 2019 16:19:26 -0500 Subject: [PATCH 18/18] fc fix --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 52e372f4cab..83984c78336 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 52e372f4cabc59d531a2bbf35bebbf244e4d9485 +Subproject commit 83984c783361fd4867c616c60d99bb236873ba9f