From dab1b3011ceaf5620927ed5df9eb4eefa6904d64 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 10:33:58 -0500 Subject: [PATCH 01/19] test NO_BUILD parameter --- .circleci/config.yml | 242 ++++++++++++++++++++++++++----------------- 1 file changed, 147 insertions(+), 95 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c58e88c30..78c50c26d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,115 +58,140 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - - test: - name: << matrix.platform >>_test - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: &filters-default - branches: - ignore: - - /rel\/.*/ - - /hotfix\/.*/ - - - test_nightly: - name: << matrix.platform >>_test_nightly + # - test: + # name: << matrix.platform >>_test + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-default + # branches: + # ignore: + # - /rel\/.*/ + # - /hotfix\/.*/ + + # - test_nightly: + # name: << matrix.platform >>_test_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-nightly + # branches: + # only: + # - /rel\/.*/ + # - /hotfix\/.*/ + # context: slack-secrets + + # - integration: + # name: << matrix.platform >>_integration + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - integration_nightly: + # name: << matrix.platform >>_integration_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_expect: + # name: << matrix.platform >>_e2e_expect + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_expect_nightly: + # name: << matrix.platform >>_e2e_expect_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_subs: + # name: << matrix.platform >>_e2e_subs + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_subs_nightly: + # name: << matrix.platform >>_e2e_subs_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - tests_verification_job: + # name: << matrix.platform >>_<< matrix.job_type >>_verification + # matrix: + # parameters: + # platform: ["amd64", "arm64", "mac_amd64"] + # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + # requires: + # - << matrix.platform >>_<< matrix.job_type >> + + - upload_nightly_binaries: + name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default + parameters: + no_build: "true" requires: - - << matrix.platform >>_build - filters: &filters-nightly + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification + filters: branches: only: - - /rel\/.*/ - - /hotfix\/.*/ - context: slack-secrets - - - integration: - name: << matrix.platform >>_integration - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - integration_nightly: - name: << matrix.platform >>_integration_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_expect: - name: << matrix.platform >>_e2e_expect - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_expect_nightly: - name: << matrix.platform >>_e2e_expect_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_subs: - name: << matrix.platform >>_e2e_subs - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_subs_nightly: - name: << matrix.platform >>_e2e_subs_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - tests_verification_job: - name: << matrix.platform >>_<< matrix.job_type >>_verification - matrix: - parameters: - platform: ["amd64", "arm64", "mac_amd64"] - job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - requires: - - << matrix.platform >>_<< matrix.job_type >> + - "rel/nightly" + context: + - slack-secrets + - aws-secrets - upload_binaries: name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default + parameters: + no_build: "false" requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification + - << matrix.platform >>_build + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification filters: branches: only: - - /rel\/.*/ + - "circleci/1809" + # - "rel/beta" + # - "rel/stable" context: - slack-secrets - aws-secrets - #- windows_x64_build commands: @@ -474,15 +499,22 @@ commands: build_dir: type: string default: << pipeline.parameters.build_dir >> + no_build: + type: string + default: "true" steps: - - attach_workspace: - at: << parameters.build_dir >> + - when: + condition: + equal: ["true", << parameters.no_build >>] + steps: + - attach_workspace: + at: << parameters.build_dir >> - run: name: Upload binaries << parameters.platform >> command: | export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') export GOPATH="<< parameters.build_dir >>/go" - export NO_BUILD=true + export NO_BUILD=<< parameters.no_build >> export TRAVIS_BRANCH=${CIRCLE_BRANCH} scripts/travis/deploy_packages.sh - when: @@ -698,11 +730,31 @@ jobs: parameters: platform: type: string + no_build: + type: string executor: << parameters.platform >>_medium steps: - prepare_build_dir - prepare_go - upload_binaries_command: platform: << parameters.platform >> + no_build: << parameters.no_build >> - slack/notify: <<: *slack-fail-event + + upload_nightly_binaries: + working_directory: << pipeline.parameters.build_dir >>/project + parameters: + platform: + type: string + no_build: + type: string + executor: << parameters.platform >>_medium + steps: + - prepare_build_dir + - prepare_go + - upload_binaries_command: + platform: << parameters.platform >> + no_build: << parameters.no_build >> + - slack/notify: + <<: *slack-fail-event \ No newline at end of file From f0550399bec7962ff570d9089b2ae6143920ec0f Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 10:43:43 -0500 Subject: [PATCH 02/19] fix no_build variable reference --- .circleci/config.yml | 47 +++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78c50c26d7..952e8c32f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,32 +149,29 @@ workflows: # requires: # - << matrix.platform >>_<< matrix.job_type >> - - upload_nightly_binaries: - name: << matrix.platform >>_upload_binaries - matrix: - <<: *matrix-default - parameters: - no_build: "true" - requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification - filters: - branches: - only: - - "rel/nightly" - context: - - slack-secrets - - aws-secrets + # - upload_nightly_binaries: + # name: << matrix.platform >>_upload_binaries + # matrix: + # <<: *matrix-default + # no_build: "true" + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification + # filters: + # branches: + # only: + # - "rel/nightly" + # context: + # - slack-secrets + # - aws-secrets - upload_binaries: name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default - parameters: - no_build: "false" requires: - << matrix.platform >>_build # requires: @@ -730,15 +727,13 @@ jobs: parameters: platform: type: string - no_build: - type: string executor: << parameters.platform >>_medium steps: - prepare_build_dir - prepare_go - upload_binaries_command: platform: << parameters.platform >> - no_build: << parameters.no_build >> + no_build: "false" - slack/notify: <<: *slack-fail-event @@ -747,14 +742,12 @@ jobs: parameters: platform: type: string - no_build: - type: string executor: << parameters.platform >>_medium steps: - prepare_build_dir - prepare_go - upload_binaries_command: platform: << parameters.platform >> - no_build: << parameters.no_build >> + no_build: "true" - slack/notify: <<: *slack-fail-event \ No newline at end of file From f48c2dbb3d34c91f12ed7e9490ef54699265f2f4 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 10:54:00 -0500 Subject: [PATCH 03/19] remove slack for testing and change attach workspace --- .circleci/config.yml | 50 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 952e8c32f9..70c82e3fb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -500,29 +500,25 @@ commands: type: string default: "true" steps: - - when: - condition: - equal: ["true", << parameters.no_build >>] - steps: - - attach_workspace: - at: << parameters.build_dir >> - - run: - name: Upload binaries << parameters.platform >> - command: | - export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') - export GOPATH="<< parameters.build_dir >>/go" - export NO_BUILD=<< parameters.no_build >> - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/deploy_packages.sh - - when: - condition: - equal: [ "amd64", << parameters.platform >> ] - steps: - - run: - name: test_release.sh - command: | - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/test_release.sh + - attach_workspace: + at: << parameters.build_dir >> + - run: + name: Upload binaries << parameters.platform >> + command: | + export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') + export GOPATH="<< parameters.build_dir >>/go" + export NO_BUILD=<< parameters.no_build >> + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/deploy_packages.sh + - when: + condition: + equal: [ "amd64", << parameters.platform >> ] + steps: + - run: + name: test_release.sh + command: | + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/test_release.sh jobs: codegen_verification: @@ -734,8 +730,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - - slack/notify: - <<: *slack-fail-event + # - slack/notify: + # <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -749,5 +745,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - - slack/notify: - <<: *slack-fail-event \ No newline at end of file + # - slack/notify: + # <<: *slack-fail-event \ No newline at end of file From 41632552c2c7316f046613fc358d10365a604b34 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 11:24:22 -0500 Subject: [PATCH 04/19] remove NO_BUILD flag when set to false --- .circleci/config.yml | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70c82e3fb6..3a891c1b38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -500,25 +500,33 @@ commands: type: string default: "true" steps: - - attach_workspace: - at: << parameters.build_dir >> - - run: - name: Upload binaries << parameters.platform >> - command: | - export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') - export GOPATH="<< parameters.build_dir >>/go" - export NO_BUILD=<< parameters.no_build >> - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/deploy_packages.sh - - when: - condition: - equal: [ "amd64", << parameters.platform >> ] - steps: - - run: - name: test_release.sh - command: | - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/test_release.sh + - attach_workspace: + at: << parameters.build_dir >> + - when: + condition: + equal: ["true", << parameters.no_build >>] + steps: + - run: + name: NO_BUILD=<< parameters.no_build >> + command: | + export NO_BUILD=<< parameters.no_build >> + - run: + name: Upload binaries << parameters.platform >> + command: | + export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') + export GOPATH="<< parameters.build_dir >>/go" + + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/deploy_packages.sh + - when: + condition: + equal: [ "amd64", << parameters.platform >> ] + steps: + - run: + name: test_release.sh + command: | + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/test_release.sh jobs: codegen_verification: From 4c3084b92a2278345de24f41f6248ef220c6e203 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 12:31:11 -0500 Subject: [PATCH 05/19] test upload_nightly_binaries works as expected --- .circleci/config.yml | 45 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a891c1b38..01a8437d20 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,26 +149,7 @@ workflows: # requires: # - << matrix.platform >>_<< matrix.job_type >> - # - upload_nightly_binaries: - # name: << matrix.platform >>_upload_binaries - # matrix: - # <<: *matrix-default - # no_build: "true" - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification - # filters: - # branches: - # only: - # - "rel/nightly" - # context: - # - slack-secrets - # - aws-secrets - - - upload_binaries: + - upload_nightly_binaries: name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default @@ -183,9 +164,27 @@ workflows: filters: branches: only: - - "circleci/1809" - # - "rel/beta" - # - "rel/stable" + - "circle/1809" + - "rel/nightly" + context: + - slack-secrets + - aws-secrets + + - upload_binaries: + name: << matrix.platform >>_upload_binaries + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification + filters: + branches: + only: + - "rel/beta" + - "rel/stable" context: - slack-secrets - aws-secrets From 06f8b15a436f19b168e1c44983e1fe01a5807439 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 12:32:23 -0500 Subject: [PATCH 06/19] test upload_nightly_binaries works as expected --- .circleci/config.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01a8437d20..c1f5100eb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -170,24 +170,24 @@ workflows: - slack-secrets - aws-secrets - - upload_binaries: - name: << matrix.platform >>_upload_binaries - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification - filters: - branches: - only: - - "rel/beta" - - "rel/stable" - context: - - slack-secrets - - aws-secrets + # - upload_binaries: + # name: << matrix.platform >>_upload_binaries + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification + # filters: + # branches: + # only: + # - "rel/beta" + # - "rel/stable" + # context: + # - slack-secrets + # - aws-secrets #- windows_x64_build commands: From 2c7280be10c770d762d13633941f03b08247a5cc Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 12:35:37 -0500 Subject: [PATCH 07/19] fix branch name for testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1f5100eb6..f13b113fa6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -164,7 +164,7 @@ workflows: filters: branches: only: - - "circle/1809" + - "circleci/1809" - "rel/nightly" context: - slack-secrets From 4a017bce2cb9b06f194ff780ed0f0c309b19dc2b Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 12:55:13 -0500 Subject: [PATCH 08/19] change where the no_build conditional lies --- .circleci/config.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f13b113fa6..1d83f81d3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,7 +150,7 @@ workflows: # - << matrix.platform >>_<< matrix.job_type >> - upload_nightly_binaries: - name: << matrix.platform >>_upload_binaries + name: << matrix.platform >>_upload_nightly_binaries matrix: <<: *matrix-default requires: @@ -503,20 +503,27 @@ commands: at: << parameters.build_dir >> - when: condition: - equal: ["true", << parameters.no_build >>] + equal: [ "false", << parameters.no_build >> ] steps: - run: - name: NO_BUILD=<< parameters.no_build >> + name: Build and Upload Binaries << parameters.platform >> + command: | + export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') + export GOPATH="<< parameters.build_dir >>/go" + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/deploy_packages.sh + - when: + condition: + equal: [ "true", << parameters.no_build >> ] + steps: + - run: + name: Upload Binaries << parameters.platform >> command: | export NO_BUILD=<< parameters.no_build >> - - run: - name: Upload binaries << parameters.platform >> - command: | - export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') - export GOPATH="<< parameters.build_dir >>/go" - - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/deploy_packages.sh + export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') + export GOPATH="<< parameters.build_dir >>/go" + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/deploy_packages.sh - when: condition: equal: [ "amd64", << parameters.platform >> ] @@ -737,8 +744,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - # - slack/notify: - # <<: *slack-fail-event + - slack/notify: + <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -752,5 +759,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - # - slack/notify: - # <<: *slack-fail-event \ No newline at end of file + - slack/notify: + <<: *slack-fail-event \ No newline at end of file From 6dc9bd456c693bcd9bddffd3413cb64953f769ca Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 12:58:38 -0500 Subject: [PATCH 09/19] disable slack while testing --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d83f81d3a..6933d0f216 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -744,8 +744,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - - slack/notify: - <<: *slack-fail-event + # - slack/notify: + # <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -759,5 +759,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - - slack/notify: - <<: *slack-fail-event \ No newline at end of file + # - slack/notify: + # <<: *slack-fail-event \ No newline at end of file From 33e02c94655b74de3a7bbbcd1d9b873976c1b6dc Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 13:16:35 -0500 Subject: [PATCH 10/19] test no_build=false again --- .circleci/config.yml | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6933d0f216..a48bac9bc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -164,30 +164,32 @@ workflows: filters: branches: only: - - "circleci/1809" - "rel/nightly" context: - slack-secrets - aws-secrets - # - upload_binaries: - # name: << matrix.platform >>_upload_binaries - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification - # filters: - # branches: - # only: - # - "rel/beta" - # - "rel/stable" - # context: - # - slack-secrets - # - aws-secrets + - upload_binaries: + name: << matrix.platform >>_upload_binaries + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification + filters: + branches: + only: + - "circleci/1809" + - "rel/beta" + - "rel/stable" + context: + - slack-secrets + - aws-secrets #- windows_x64_build commands: From 090aeb0937f09890c87fb57dab1ab3f143fc22ed Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 14:34:47 -0500 Subject: [PATCH 11/19] clean up debugging --- .circleci/config.yml | 213 +++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 109 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a48bac9bc2..0ebc17dad4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,109 +58,107 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - # - test: - # name: << matrix.platform >>_test - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-default - # branches: - # ignore: - # - /rel\/.*/ - # - /hotfix\/.*/ - - # - test_nightly: - # name: << matrix.platform >>_test_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-nightly - # branches: - # only: - # - /rel\/.*/ - # - /hotfix\/.*/ - # context: slack-secrets - - # - integration: - # name: << matrix.platform >>_integration - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - integration_nightly: - # name: << matrix.platform >>_integration_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_expect: - # name: << matrix.platform >>_e2e_expect - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_expect_nightly: - # name: << matrix.platform >>_e2e_expect_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_subs: - # name: << matrix.platform >>_e2e_subs - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_subs_nightly: - # name: << matrix.platform >>_e2e_subs_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - tests_verification_job: - # name: << matrix.platform >>_<< matrix.job_type >>_verification - # matrix: - # parameters: - # platform: ["amd64", "arm64", "mac_amd64"] - # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - # requires: - # - << matrix.platform >>_<< matrix.job_type >> + - test: + name: << matrix.platform >>_test + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-default + branches: + ignore: + - /rel\/.*/ + - /hotfix\/.*/ + + - test_nightly: + name: << matrix.platform >>_test_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-nightly + branches: + only: + - /rel\/.*/ + - /hotfix\/.*/ + context: slack-secrets + + - integration: + name: << matrix.platform >>_integration + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - integration_nightly: + name: << matrix.platform >>_integration_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_expect: + name: << matrix.platform >>_e2e_expect + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_expect_nightly: + name: << matrix.platform >>_e2e_expect_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_subs: + name: << matrix.platform >>_e2e_subs + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_subs_nightly: + name: << matrix.platform >>_e2e_subs_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - tests_verification_job: + name: << matrix.platform >>_<< matrix.job_type >>_verification + matrix: + parameters: + platform: ["amd64", "arm64", "mac_amd64"] + job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + requires: + - << matrix.platform >>_<< matrix.job_type >> - upload_nightly_binaries: name: << matrix.platform >>_upload_nightly_binaries matrix: <<: *matrix-default requires: - - << matrix.platform >>_build - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification filters: branches: only: @@ -174,17 +172,14 @@ workflows: matrix: <<: *matrix-default requires: - - << matrix.platform >>_build - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification filters: branches: only: - - "circleci/1809" - "rel/beta" - "rel/stable" context: @@ -746,8 +741,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - # - slack/notify: - # <<: *slack-fail-event + - slack/notify: + <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -761,5 +756,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - # - slack/notify: - # <<: *slack-fail-event \ No newline at end of file + - slack/notify: + <<: *slack-fail-event \ No newline at end of file From 6a26c9f8c2c9692f55f3238c7c544e321193b5b2 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 15:03:13 -0500 Subject: [PATCH 12/19] reduce the code in upload_binaries_command --- .circleci/config.yml | 244 +++++++++++++++++++++---------------------- 1 file changed, 117 insertions(+), 127 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ebc17dad4..1563fa3e05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,107 +58,109 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - - test: - name: << matrix.platform >>_test - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: &filters-default - branches: - ignore: - - /rel\/.*/ - - /hotfix\/.*/ - - - test_nightly: - name: << matrix.platform >>_test_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: &filters-nightly - branches: - only: - - /rel\/.*/ - - /hotfix\/.*/ - context: slack-secrets - - - integration: - name: << matrix.platform >>_integration - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - integration_nightly: - name: << matrix.platform >>_integration_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_expect: - name: << matrix.platform >>_e2e_expect - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_expect_nightly: - name: << matrix.platform >>_e2e_expect_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_subs: - name: << matrix.platform >>_e2e_subs - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_subs_nightly: - name: << matrix.platform >>_e2e_subs_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - tests_verification_job: - name: << matrix.platform >>_<< matrix.job_type >>_verification - matrix: - parameters: - platform: ["amd64", "arm64", "mac_amd64"] - job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - requires: - - << matrix.platform >>_<< matrix.job_type >> + # - test: + # name: << matrix.platform >>_test + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-default + # branches: + # ignore: + # - /rel\/.*/ + # - /hotfix\/.*/ + + # - test_nightly: + # name: << matrix.platform >>_test_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-nightly + # branches: + # only: + # - /rel\/.*/ + # - /hotfix\/.*/ + # context: slack-secrets + + # - integration: + # name: << matrix.platform >>_integration + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - integration_nightly: + # name: << matrix.platform >>_integration_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_expect: + # name: << matrix.platform >>_e2e_expect + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_expect_nightly: + # name: << matrix.platform >>_e2e_expect_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_subs: + # name: << matrix.platform >>_e2e_subs + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_subs_nightly: + # name: << matrix.platform >>_e2e_subs_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - tests_verification_job: + # name: << matrix.platform >>_<< matrix.job_type >>_verification + # matrix: + # parameters: + # platform: ["amd64", "arm64", "mac_amd64"] + # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + # requires: + # - << matrix.platform >>_<< matrix.job_type >> - upload_nightly_binaries: name: << matrix.platform >>_upload_nightly_binaries matrix: <<: *matrix-default requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification + - << matrix.platform >>_build + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification filters: branches: only: @@ -172,14 +174,17 @@ workflows: matrix: <<: *matrix-default requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification + - << matrix.platform >>_build + # requires: + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification filters: branches: only: + - "circleci/1809" - "rel/beta" - "rel/stable" context: @@ -498,29 +503,14 @@ commands: steps: - attach_workspace: at: << parameters.build_dir >> - - when: - condition: - equal: [ "false", << parameters.no_build >> ] - steps: - - run: - name: Build and Upload Binaries << parameters.platform >> - command: | - export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') - export GOPATH="<< parameters.build_dir >>/go" - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/deploy_packages.sh - - when: - condition: - equal: [ "true", << parameters.no_build >> ] - steps: - - run: - name: Upload Binaries << parameters.platform >> - command: | - export NO_BUILD=<< parameters.no_build >> - export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') - export GOPATH="<< parameters.build_dir >>/go" - export TRAVIS_BRANCH=${CIRCLE_BRANCH} - scripts/travis/deploy_packages.sh + - run: + name: Upload Binaries << parameters.platform >> + command: | + export NO_BUILD=<< parameters.no_build >> + export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') + export GOPATH="<< parameters.build_dir >>/go" + export TRAVIS_BRANCH=${CIRCLE_BRANCH} + scripts/travis/deploy_packages.sh - when: condition: equal: [ "amd64", << parameters.platform >> ] @@ -741,8 +731,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - - slack/notify: - <<: *slack-fail-event + # - slack/notify: + # <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -756,5 +746,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - - slack/notify: - <<: *slack-fail-event \ No newline at end of file + # - slack/notify: + # <<: *slack-fail-event \ No newline at end of file From 4d16e8f27183b2610bca58fda56afc9c3a666936 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 15:21:29 -0500 Subject: [PATCH 13/19] test no_build=true --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1563fa3e05..19a6a1a4c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -164,6 +164,7 @@ workflows: filters: branches: only: + - "circleci/1809" - "rel/nightly" context: - slack-secrets @@ -184,7 +185,7 @@ workflows: filters: branches: only: - - "circleci/1809" + # - "circleci/1809" - "rel/beta" - "rel/stable" context: From 648c43ca005ab4c0f93a2de6b758d518b775c0dc Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 6 Jan 2022 15:42:14 -0500 Subject: [PATCH 14/19] clean up config file --- .circleci/config.yml | 214 +++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 110 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 19a6a1a4c2..9ae8c5c015 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,113 +58,110 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - # - test: - # name: << matrix.platform >>_test - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-default - # branches: - # ignore: - # - /rel\/.*/ - # - /hotfix\/.*/ - - # - test_nightly: - # name: << matrix.platform >>_test_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-nightly - # branches: - # only: - # - /rel\/.*/ - # - /hotfix\/.*/ - # context: slack-secrets - - # - integration: - # name: << matrix.platform >>_integration - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - integration_nightly: - # name: << matrix.platform >>_integration_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_expect: - # name: << matrix.platform >>_e2e_expect - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_expect_nightly: - # name: << matrix.platform >>_e2e_expect_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_subs: - # name: << matrix.platform >>_e2e_subs - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_subs_nightly: - # name: << matrix.platform >>_e2e_subs_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - tests_verification_job: - # name: << matrix.platform >>_<< matrix.job_type >>_verification - # matrix: - # parameters: - # platform: ["amd64", "arm64", "mac_amd64"] - # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - # requires: - # - << matrix.platform >>_<< matrix.job_type >> + - test: + name: << matrix.platform >>_test + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-default + branches: + ignore: + - /rel\/.*/ + - /hotfix\/.*/ + + - test_nightly: + name: << matrix.platform >>_test_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-nightly + branches: + only: + - /rel\/.*/ + - /hotfix\/.*/ + context: slack-secrets + + - integration: + name: << matrix.platform >>_integration + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - integration_nightly: + name: << matrix.platform >>_integration_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_expect: + name: << matrix.platform >>_e2e_expect + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_expect_nightly: + name: << matrix.platform >>_e2e_expect_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_subs: + name: << matrix.platform >>_e2e_subs + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_subs_nightly: + name: << matrix.platform >>_e2e_subs_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - tests_verification_job: + name: << matrix.platform >>_<< matrix.job_type >>_verification + matrix: + parameters: + platform: ["amd64", "arm64", "mac_amd64"] + job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + requires: + - << matrix.platform >>_<< matrix.job_type >> - upload_nightly_binaries: name: << matrix.platform >>_upload_nightly_binaries matrix: <<: *matrix-default requires: - - << matrix.platform >>_build - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification filters: branches: only: - - "circleci/1809" - "rel/nightly" context: - slack-secrets @@ -175,17 +172,14 @@ workflows: matrix: <<: *matrix-default requires: - - << matrix.platform >>_build - # requires: - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification filters: branches: only: - # - "circleci/1809" - "rel/beta" - "rel/stable" context: @@ -732,8 +726,8 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "false" - # - slack/notify: - # <<: *slack-fail-event + - slack/notify: + <<: *slack-fail-event upload_nightly_binaries: working_directory: << pipeline.parameters.build_dir >>/project @@ -747,5 +741,5 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> no_build: "true" - # - slack/notify: - # <<: *slack-fail-event \ No newline at end of file + - slack/notify: + <<: *slack-fail-event \ No newline at end of file From 63096cb04e557ec61358030a807522a3c0d0f5ad Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Mon, 10 Jan 2022 16:05:06 -0500 Subject: [PATCH 15/19] test no_build=true --- .circleci/config.yml | 240 +++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 137 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ae8c5c015..40daee8864 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,130 +58,112 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - - test: - name: << matrix.platform >>_test - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: &filters-default - branches: - ignore: - - /rel\/.*/ - - /hotfix\/.*/ - - - test_nightly: - name: << matrix.platform >>_test_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: &filters-nightly - branches: - only: - - /rel\/.*/ - - /hotfix\/.*/ - context: slack-secrets - - - integration: - name: << matrix.platform >>_integration - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - integration_nightly: - name: << matrix.platform >>_integration_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_expect: - name: << matrix.platform >>_e2e_expect - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_expect_nightly: - name: << matrix.platform >>_e2e_expect_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - e2e_subs: - name: << matrix.platform >>_e2e_subs - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-default - - - e2e_subs_nightly: - name: << matrix.platform >>_e2e_subs_nightly - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_build - filters: - <<: *filters-nightly - context: slack-secrets - - - tests_verification_job: - name: << matrix.platform >>_<< matrix.job_type >>_verification - matrix: - parameters: - platform: ["amd64", "arm64", "mac_amd64"] - job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - requires: - - << matrix.platform >>_<< matrix.job_type >> - - - upload_nightly_binaries: - name: << matrix.platform >>_upload_nightly_binaries - matrix: - <<: *matrix-default - requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification - filters: - branches: - only: - - "rel/nightly" - context: - - slack-secrets - - aws-secrets + # - test: + # name: << matrix.platform >>_test + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-default + # branches: + # ignore: + # - /rel\/.*/ + # - /hotfix\/.*/ + + # - test_nightly: + # name: << matrix.platform >>_test_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: &filters-nightly + # branches: + # only: + # - /rel\/.*/ + # - /hotfix\/.*/ + # context: slack-secrets + + # - integration: + # name: << matrix.platform >>_integration + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - integration_nightly: + # name: << matrix.platform >>_integration_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_expect: + # name: << matrix.platform >>_e2e_expect + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_expect_nightly: + # name: << matrix.platform >>_e2e_expect_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - e2e_subs: + # name: << matrix.platform >>_e2e_subs + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-default + + # - e2e_subs_nightly: + # name: << matrix.platform >>_e2e_subs_nightly + # matrix: + # <<: *matrix-default + # requires: + # - << matrix.platform >>_build + # filters: + # <<: *filters-nightly + # context: slack-secrets + + # - tests_verification_job: + # name: << matrix.platform >>_<< matrix.job_type >>_verification + # matrix: + # parameters: + # platform: ["amd64", "arm64", "mac_amd64"] + # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + # requires: + # - << matrix.platform >>_<< matrix.job_type >> - upload_binaries: name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default requires: - - << matrix.platform >>_test_nightly_verification - - << matrix.platform >>_integration_nightly_verification - - << matrix.platform >>_e2e_expect_nightly_verification - - << matrix.platform >>_e2e_subs_nightly - - codegen_verification + - << matrix.platform >>_build + # - << matrix.platform >>_test_nightly_verification + # - << matrix.platform >>_integration_nightly_verification + # - << matrix.platform >>_e2e_expect_nightly_verification + # - << matrix.platform >>_e2e_subs_nightly + # - codegen_verification filters: branches: only: - - "rel/beta" - - "rel/stable" + - /rel\/.*/ context: - slack-secrets - aws-secrets @@ -492,16 +474,16 @@ commands: build_dir: type: string default: << pipeline.parameters.build_dir >> - no_build: - type: string - default: "true" steps: - attach_workspace: at: << parameters.build_dir >> - run: name: Upload Binaries << parameters.platform >> command: | - export NO_BUILD=<< parameters.no_build >> + if [ "${CIRCLE_BRANCH}" = "circleci/1809" ] + then + export NO_BUILD="true" + fi export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g') export GOPATH="<< parameters.build_dir >>/go" export TRAVIS_BRANCH=${CIRCLE_BRANCH} @@ -725,21 +707,5 @@ jobs: - prepare_go - upload_binaries_command: platform: << parameters.platform >> - no_build: "false" - - slack/notify: - <<: *slack-fail-event - - upload_nightly_binaries: - working_directory: << pipeline.parameters.build_dir >>/project - parameters: - platform: - type: string - executor: << parameters.platform >>_medium - steps: - - prepare_build_dir - - prepare_go - - upload_binaries_command: - platform: << parameters.platform >> - no_build: "true" - - slack/notify: - <<: *slack-fail-event \ No newline at end of file + # - slack/notify: + # <<: *slack-fail-event \ No newline at end of file From d11d0f72987cd0d0c23bcc9019659fe93dfe2c5f Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Mon, 10 Jan 2022 16:20:38 -0500 Subject: [PATCH 16/19] test circleci/1809 branch no_build=true --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40daee8864..929e08bea1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -163,7 +163,8 @@ workflows: filters: branches: only: - - /rel\/.*/ + # - /rel\/.*/ + - "circleci/1809" context: - slack-secrets - aws-secrets From 5de287c323ff90793e9fe85aec24c24811a2e5e6 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Mon, 10 Jan 2022 16:38:04 -0500 Subject: [PATCH 17/19] test NO_BUILD=false --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 929e08bea1..ac6ab5881f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -481,7 +481,7 @@ commands: - run: name: Upload Binaries << parameters.platform >> command: | - if [ "${CIRCLE_BRANCH}" = "circleci/1809" ] + if [ "${CIRCLE_BRANCH}" = "rel/nightly" ] then export NO_BUILD="true" fi From cd69d93e08c8fbaa88a19324a0fb72ca5e062e53 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Mon, 10 Jan 2022 16:53:13 -0500 Subject: [PATCH 18/19] remove debugging and testing code --- .circleci/config.yml | 198 +++++++++++++++++++++---------------------- 1 file changed, 98 insertions(+), 100 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac6ab5881f..0006674b4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,113 +58,111 @@ workflows: parameters: platform: ["amd64", "arm64", "mac_amd64"] - # - test: - # name: << matrix.platform >>_test - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-default - # branches: - # ignore: - # - /rel\/.*/ - # - /hotfix\/.*/ - - # - test_nightly: - # name: << matrix.platform >>_test_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: &filters-nightly - # branches: - # only: - # - /rel\/.*/ - # - /hotfix\/.*/ - # context: slack-secrets - - # - integration: - # name: << matrix.platform >>_integration - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - integration_nightly: - # name: << matrix.platform >>_integration_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_expect: - # name: << matrix.platform >>_e2e_expect - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_expect_nightly: - # name: << matrix.platform >>_e2e_expect_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - e2e_subs: - # name: << matrix.platform >>_e2e_subs - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-default - - # - e2e_subs_nightly: - # name: << matrix.platform >>_e2e_subs_nightly - # matrix: - # <<: *matrix-default - # requires: - # - << matrix.platform >>_build - # filters: - # <<: *filters-nightly - # context: slack-secrets - - # - tests_verification_job: - # name: << matrix.platform >>_<< matrix.job_type >>_verification - # matrix: - # parameters: - # platform: ["amd64", "arm64", "mac_amd64"] - # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] - # requires: - # - << matrix.platform >>_<< matrix.job_type >> + - test: + name: << matrix.platform >>_test + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-default + branches: + ignore: + - /rel\/.*/ + - /hotfix\/.*/ + + - test_nightly: + name: << matrix.platform >>_test_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: &filters-nightly + branches: + only: + - /rel\/.*/ + - /hotfix\/.*/ + context: slack-secrets + + - integration: + name: << matrix.platform >>_integration + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - integration_nightly: + name: << matrix.platform >>_integration_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_expect: + name: << matrix.platform >>_e2e_expect + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_expect_nightly: + name: << matrix.platform >>_e2e_expect_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - e2e_subs: + name: << matrix.platform >>_e2e_subs + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-default + + - e2e_subs_nightly: + name: << matrix.platform >>_e2e_subs_nightly + matrix: + <<: *matrix-default + requires: + - << matrix.platform >>_build + filters: + <<: *filters-nightly + context: slack-secrets + + - tests_verification_job: + name: << matrix.platform >>_<< matrix.job_type >>_verification + matrix: + parameters: + platform: ["amd64", "arm64", "mac_amd64"] + job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + requires: + - << matrix.platform >>_<< matrix.job_type >> - upload_binaries: name: << matrix.platform >>_upload_binaries matrix: <<: *matrix-default requires: - - << matrix.platform >>_build - # - << matrix.platform >>_test_nightly_verification - # - << matrix.platform >>_integration_nightly_verification - # - << matrix.platform >>_e2e_expect_nightly_verification - # - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - << matrix.platform >>_test_nightly_verification + - << matrix.platform >>_integration_nightly_verification + - << matrix.platform >>_e2e_expect_nightly_verification + - << matrix.platform >>_e2e_subs_nightly + - codegen_verification filters: branches: only: - # - /rel\/.*/ - - "circleci/1809" + - /rel\/.*/ context: - slack-secrets - aws-secrets @@ -708,5 +706,5 @@ jobs: - prepare_go - upload_binaries_command: platform: << parameters.platform >> - # - slack/notify: - # <<: *slack-fail-event \ No newline at end of file + - slack/notify: + <<: *slack-fail-event \ No newline at end of file From acadf4b4cf03f622ce805521679d127b017b52dc Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Tue, 11 Jan 2022 09:38:39 -0500 Subject: [PATCH 19/19] readd newline --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0006674b4c..2f2efbb778 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -707,4 +707,4 @@ jobs: - upload_binaries_command: platform: << parameters.platform >> - slack/notify: - <<: *slack-fail-event \ No newline at end of file + <<: *slack-fail-event