From 66b3f3a4651be32284d43297f44761461c29e43a Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 21 May 2019 17:13:13 -0600 Subject: [PATCH 1/3] Exclude non-go workflows while testing --- .circleci/config.yml | 106 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ddac79829..8b34b850e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,14 +424,14 @@ jobs: workflows: version: 2 - build-distros: - jobs: - - go-fmt-and-vet - - build-386: &require-go-fmt-vet - requires: - - go-fmt-and-vet - - build-amd64: *require-go-fmt-vet - - build-arm-arm64: *require-go-fmt-vet + # build-distros: + # jobs: + # - go-fmt-and-vet + # - build-386: &require-go-fmt-vet + # requires: + # - go-fmt-and-vet + # - build-amd64: *require-go-fmt-vet + # - build-arm-arm64: *require-go-fmt-vet test-integrations: jobs: - dev-build @@ -443,48 +443,48 @@ workflows: only: - /^bug\/flaky-test-.*$/ # only run go tests on bug/flaky-test-* for now since we are fixing tests - go-test-api: *go-test - - dev-upload-s3: - requires: - - dev-build - filters: - branches: - ignore: - - /^pull\/.*$/ # only push dev builds from non forks - - nomad-integration-master: - requires: - - dev-build - - nomad-integration-0_8: - requires: - - dev-build - - envoy-integration-test-1.8.0: - requires: - - dev-build - - envoy-integration-test-1.9.1: - requires: - - dev-build - website: - jobs: - - build-website - - docs-link-checker: - requires: - - build-website - filters: - branches: - ignore: - - /^pull\/.*$/ # only run link checker on non forks - - deploy-website: - requires: - - docs-link-checker - context: static-sites - filters: - branches: - only: stable-website - frontend: - jobs: - - frontend-cache - - ember-build: - requires: - - frontend-cache - - ember-test: - requires: - - ember-build + # - dev-upload-s3: + # requires: + # - dev-build + # filters: + # branches: + # ignore: + # - /^pull\/.*$/ # only push dev builds from non forks + # - nomad-integration-master: + # requires: + # - dev-build + # - nomad-integration-0_8: + # requires: + # - dev-build + # - envoy-integration-test-1.8.0: + # requires: + # - dev-build + # - envoy-integration-test-1.9.1: + # requires: + # - dev-build + # website: + # jobs: + # - build-website + # - docs-link-checker: + # requires: + # - build-website + # filters: + # branches: + # ignore: + # - /^pull\/.*$/ # only run link checker on non forks + # - deploy-website: + # requires: + # - docs-link-checker + # context: static-sites + # filters: + # branches: + # only: stable-website + # frontend: + # jobs: + # - frontend-cache + # - ember-build: + # requires: + # - frontend-cache + # - ember-test: + # requires: + # - ember-build From d133d565a545e130b61651cf8c3dc341ba1fc1c8 Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 21 May 2019 17:58:37 -0600 Subject: [PATCH 2/3] Wait for s2 global-management policy --- agent/consul/acl_replication_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/agent/consul/acl_replication_test.go b/agent/consul/acl_replication_test.go index 44be6e0b4..53842b37d 100644 --- a/agent/consul/acl_replication_test.go +++ b/agent/consul/acl_replication_test.go @@ -376,6 +376,13 @@ func TestACLReplication_Tokens(t *testing.T) { checkSame(r) }) + // Wait for s2 global-management policy + retry.Run(t, func(r *retry.R) { + _, policy, err := s2.fsm.State().ACLPolicyGetByID(nil, structs.ACLPolicyGlobalManagementID) + require.NoError(r, err) + require.NotNil(t, policy) + }) + // add some local tokens to the secondary DC // these shouldn't be deleted by replication for i := 0; i < 50; i++ { From 3d4165deeb2208c6a0c85ec810a96c5335ee9449 Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 21 May 2019 19:17:39 -0600 Subject: [PATCH 3/3] Revert "Exclude non-go workflows while testing" This reverts commit 47a83cbe9f19d0e1e475eabaa223d61fb4c56019. --- .circleci/config.yml | 106 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b34b850e..ddac79829 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,14 +424,14 @@ jobs: workflows: version: 2 - # build-distros: - # jobs: - # - go-fmt-and-vet - # - build-386: &require-go-fmt-vet - # requires: - # - go-fmt-and-vet - # - build-amd64: *require-go-fmt-vet - # - build-arm-arm64: *require-go-fmt-vet + build-distros: + jobs: + - go-fmt-and-vet + - build-386: &require-go-fmt-vet + requires: + - go-fmt-and-vet + - build-amd64: *require-go-fmt-vet + - build-arm-arm64: *require-go-fmt-vet test-integrations: jobs: - dev-build @@ -443,48 +443,48 @@ workflows: only: - /^bug\/flaky-test-.*$/ # only run go tests on bug/flaky-test-* for now since we are fixing tests - go-test-api: *go-test - # - dev-upload-s3: - # requires: - # - dev-build - # filters: - # branches: - # ignore: - # - /^pull\/.*$/ # only push dev builds from non forks - # - nomad-integration-master: - # requires: - # - dev-build - # - nomad-integration-0_8: - # requires: - # - dev-build - # - envoy-integration-test-1.8.0: - # requires: - # - dev-build - # - envoy-integration-test-1.9.1: - # requires: - # - dev-build - # website: - # jobs: - # - build-website - # - docs-link-checker: - # requires: - # - build-website - # filters: - # branches: - # ignore: - # - /^pull\/.*$/ # only run link checker on non forks - # - deploy-website: - # requires: - # - docs-link-checker - # context: static-sites - # filters: - # branches: - # only: stable-website - # frontend: - # jobs: - # - frontend-cache - # - ember-build: - # requires: - # - frontend-cache - # - ember-test: - # requires: - # - ember-build + - dev-upload-s3: + requires: + - dev-build + filters: + branches: + ignore: + - /^pull\/.*$/ # only push dev builds from non forks + - nomad-integration-master: + requires: + - dev-build + - nomad-integration-0_8: + requires: + - dev-build + - envoy-integration-test-1.8.0: + requires: + - dev-build + - envoy-integration-test-1.9.1: + requires: + - dev-build + website: + jobs: + - build-website + - docs-link-checker: + requires: + - build-website + filters: + branches: + ignore: + - /^pull\/.*$/ # only run link checker on non forks + - deploy-website: + requires: + - docs-link-checker + context: static-sites + filters: + branches: + only: stable-website + frontend: + jobs: + - frontend-cache + - ember-build: + requires: + - frontend-cache + - ember-test: + requires: + - ember-build