diff options
| author | Lamont Granquist <lamont@chef.io> | 2019-12-13 00:15:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 00:15:10 -0800 |
| commit | 8a8d169879c1b04aa5ccb4dd2df44701a37d3a74 (patch) | |
| tree | b190d383d3c4f2b15e396608ea5b3b971d195706 | |
| parent | 9e855c5e91697db393bc28ddeefdc7b5ead49924 (diff) | |
| parent | 41f924b185c2a14f34c0ebf25864a89b2291c77a (diff) | |
| download | chef-8a8d169879c1b04aa5ccb4dd2df44701a37d3a74.tar.gz | |
Merge pull request #9160 from chef/lcg/accept-license-omnibus-tests
omnibus tests need to accept the license
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 3 | ||||
| -rw-r--r-- | omnibus/omnibus-test.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index 4871ff0ec7..dfa69d74b1 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -82,6 +82,9 @@ Get-Location # ffi-yajl must run in c-extension mode for perf, so force it so we don't accidentally fall back to ffi $Env:FORCE_FFI_YAJL = "ext" +# accept license +$Env:CHEF_LICENSE = "accept-no-persist" + # some tests need winrm configured winrm quickconfig -quiet diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh index 66114e005c..d5d5959e12 100644 --- a/omnibus/omnibus-test.sh +++ b/omnibus/omnibus-test.sh @@ -152,6 +152,9 @@ elif [[ -d /usr/local/etc/sudoers.d ]]; then sudo chmod 440 "/usr/local/etc/sudoers.d/$(id -un)-preserve_path" fi +# accept license +CHEF_LICENSE=accept-no-persist + cd "$chef_gem" sudo -E bundle install # NOTE: we have unit tests in chef/chef which ARE NOT unit tests. We need to run them on the actual shipping production artifact on the |