From 6ba7512057aa752ce5c9f914b9d103997a3f77e0 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Fri, 5 Nov 2021 10:41:29 -0400 Subject: [PATCH] Fix regression preventing non-docker tests from running. (#13063) --- .circleci/config.yml | 24 ++++++++++++------------ .circleci/config/commands/go_test.yml | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fab70fe4b..76e2e5253e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1011,12 +1011,12 @@ jobs: package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) else - package_names=$(< test-list-json jq -r 'select(.Deps != null) | + package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) fi # Move back into root directory popd @@ -1282,12 +1282,12 @@ jobs: package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) else - package_names=$(< test-list-json jq -r 'select(.Deps != null) | + package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) fi # Move back into root directory popd @@ -1804,12 +1804,12 @@ jobs: package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) else - package_names=$(< test-list-json jq -r 'select(.Deps != null) | + package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) fi # Move back into root directory popd @@ -2470,12 +2470,12 @@ jobs: package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) else - package_names=$(< test-list-json jq -r 'select(.Deps != null) | + package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) fi # Move back into root directory popd diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index bd728e8a38..6ea817b122 100644 --- a/.circleci/config/commands/go_test.yml +++ b/.circleci/config/commands/go_test.yml @@ -74,12 +74,12 @@ steps: package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) else - package_names=$(< test-list-json jq -r 'select(.Deps != null) | + package_names=$(< test-list.json jq -r 'select(.Deps != null) | select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) | .ForTest | select(. != null)' | - sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true + sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true) fi # Move back into root directory popd