scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 10:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put go_test.yml back how it was (on ent) re licensing (#11736)

Browse Source
This commit is contained in:
Nick Cabatoff
2021-06-01 16:31:45 +02:00
committed by GitHub
parent e5b6515ee7
commit c706ca2cc9
2 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
.circleci/config.yml generated
View File

@@ -933,9 +933,14 @@ jobs:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer
@@ -1155,9 +1160,14 @@ jobs:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer
@@ -1628,9 +1638,14 @@ jobs:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer
@@ -1781,9 +1796,14 @@ jobs:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer
@@ -2385,9 +2405,14 @@ jobs:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer

11
.circleci/config/commands/go_test.yml
View File

@@ -76,9 +76,14 @@ steps:
make prep
mkdir -p test-results/go-test
# Don't tempt fate by having the license env var populated: tests should
# have to use it explicitly (via env var VAULT_LICENSE_CI) rather than
# depending on an implicit behaviour.
# We don't want VAULT_LICENSE set when running Go tests, because that's
# not what developers have in their environments and it could break some
# tests; it would be like setting VAULT_TOKEN. However some non-Go
# CI commands, like the UI tests, shouldn't have to worry about licensing.
# So we set VAULT_LICENSE in CI, and here we unset it. Instead of
# VAULT_LICENSE, we populate VAULT_LICENSE_CI, so that tests which want
# an externally supplied license can opt-in to using it.
export VAULT_LICENSE_CI="$VAULT_LICENSE"
VAULT_LICENSE=
# Create a docker network for our testcontainer