From 1462fcd0b551b47946aa7f7623a682e3c4900eb4 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 13:28:40 -0400 Subject: [PATCH 01/10] reverting to buildkite artifacts vs the NAS --- .buildkite/pipeline.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 780fcf67615..7c874086b53 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -33,7 +33,8 @@ steps: - label: ":darwin: [Darwin] Mojave Build" command: - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m" - - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos" + - "tar -pczf build.tar.gz build" + artifact_paths: "build.tar.gz" plugins: chef/anka#v0.4.4: no-volume: true @@ -152,8 +153,9 @@ steps: # MOJAVE # - label: ":darwin: [Darwin] Mojave Tests" command: - - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz" - - "cd eos && ./scripts/parallel-test.sh" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT}" + - "buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" + - "./scripts/parallel-test.sh" agents: - "queue=mac-anka-node-fleet" plugins: @@ -171,8 +173,9 @@ steps: - label: ":darwin: [Darwin] Mojave NP Tests" command: - - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz" - - "cd eos && ./scripts/serial-test.sh" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT}" + - "buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" + - "./scripts/serial-test.sh" agents: - "queue=mac-anka-node-fleet" plugins: @@ -467,7 +470,7 @@ steps: - label: ":darwin: Mojave Package Builder" command: - - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\" && tar -xzf build.tar.gz" - "cd eos/build/packages && bash generate_package.sh brew" - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz" - "cd eos && buildkite-agent artifact upload build/packages/*.rb" @@ -476,6 +479,7 @@ steps: plugins: chef/anka#v0.4.4: no-volume: true + workdir: $WORKDIR inherit-environment-vars: true bash-interactive: true vm-name: $ANKA_MOJAVE_TEMPLATE From 21ea5dee07db2422f2c0ad196a2a2eaf5cdd5d1e Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 13:30:06 -0400 Subject: [PATCH 02/10] quick fix --- .buildkite/pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7c874086b53..66eefaceff2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -32,8 +32,7 @@ steps: - label: ":darwin: [Darwin] Mojave Build" command: - - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m" - - "tar -pczf build.tar.gz build" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build" artifact_paths: "build.tar.gz" plugins: chef/anka#v0.4.4: From 31a4283f3a6913c9528dafdff82a875c2fdb0b26 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 13:40:22 -0400 Subject: [PATCH 03/10] fixes to logic --- .buildkite/pipeline.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 66eefaceff2..9f86044e029 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -152,9 +152,8 @@ steps: # MOJAVE # - label: ":darwin: [Darwin] Mojave Tests" command: - - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT}" - - "buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" - - "./scripts/parallel-test.sh" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" + - "cd eos && ./scripts/parallel-test.sh" agents: - "queue=mac-anka-node-fleet" plugins: @@ -172,9 +171,8 @@ steps: - label: ":darwin: [Darwin] Mojave NP Tests" command: - - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT}" - - "buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" - - "./scripts/serial-test.sh" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\"" + - "cd eos && ./scripts/serial-test.sh" agents: - "queue=mac-anka-node-fleet" plugins: From 9d7ac590de903dae8adde26ac851aa6183b30670 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 15:10:27 -0400 Subject: [PATCH 04/10] 12 cores for ensure --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9f86044e029..9bcf41c9ebe 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,7 +10,7 @@ steps: - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists" command: - "git clone git@github.com:EOSIO/mac-anka-fleet.git" - - "cd mac-anka-fleet && . ./ensure_tag.bash -a \"-n\"" + - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" agents: - "queue=mac-anka-templater-fleet" env: From 7bc19a81f7e2c136a1c57492810f2dc580a136a6 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 15:14:16 -0400 Subject: [PATCH 05/10] artifact fix --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9bcf41c9ebe..23fc5097fb3 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -32,7 +32,7 @@ steps: - label: ":darwin: [Darwin] Mojave Build" command: - - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build && mv build.tar.gz ../" artifact_paths: "build.tar.gz" plugins: chef/anka#v0.4.4: From 2c459d3f83110d397dd7cb926b1b62bf6e824053 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 15:26:58 -0400 Subject: [PATCH 06/10] build.tar.gz fix --- .buildkite/pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 23fc5097fb3..519ebcf91f3 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -32,8 +32,7 @@ steps: - label: ":darwin: [Darwin] Mojave Build" command: - - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build && mv build.tar.gz ../" - artifact_paths: "build.tar.gz" + - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz" plugins: chef/anka#v0.4.4: no-volume: true From 6049fe3a13479b787faa3a1fd739265274fe694e Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 17:55:35 -0400 Subject: [PATCH 07/10] fixes --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 519ebcf91f3..7cffe39f1f1 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,7 +10,7 @@ steps: - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists" command: - "git clone git@github.com:EOSIO/mac-anka-fleet.git" - - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" + - "cd mac-anka-fleet && ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" agents: - "queue=mac-anka-templater-fleet" env: From 540640a49101f3591fa78532743912826e6cb0d0 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 18:11:20 -0400 Subject: [PATCH 08/10] fixes --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7cffe39f1f1..519ebcf91f3 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,7 +10,7 @@ steps: - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists" command: - "git clone git@github.com:EOSIO/mac-anka-fleet.git" - - "cd mac-anka-fleet && ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" + - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" agents: - "queue=mac-anka-templater-fleet" env: From 6f89bfd34e1ecc86945efe836e7917c76973162c Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 18:19:34 -0400 Subject: [PATCH 09/10] fixes --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 519ebcf91f3..e9ea877da5a 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,7 +10,7 @@ steps: - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists" command: - "git clone git@github.com:EOSIO/mac-anka-fleet.git" - - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\"" + - "cd mac-anka-fleet && . ./ensure_tag.bash -u '12' -r '25G' -a \"-n\"" agents: - "queue=mac-anka-templater-fleet" env: From 3ae79e1c4ca392284a5db33154cce3ba7074d0e5 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 13 May 2019 18:38:19 -0400 Subject: [PATCH 10/10] fixes --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e9ea877da5a..18dd4c5b250 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,7 +10,7 @@ steps: - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists" command: - "git clone git@github.com:EOSIO/mac-anka-fleet.git" - - "cd mac-anka-fleet && . ./ensure_tag.bash -u '12' -r '25G' -a \"-n\"" + - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'" agents: - "queue=mac-anka-templater-fleet" env: