From 8c42452b77e0f5163476d2dda6ece1704569b12a Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Mon, 13 May 2019 10:48:31 +0100 Subject: [PATCH] [CI] Set HAB_LICENSE=accept-no-persist in nightly A1 tests The most recent habitat now requires license acceptance. See also: https://github.com/chef/automate/pull/207 Signed-off-by: Steven Danna --- .../automate-deployment/a1-migration/install.rb | 11 ++++++++--- components/automate-deployment/basic-a1/install.rb | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/components/automate-deployment/a1-migration/install.rb b/components/automate-deployment/a1-migration/install.rb index 636842a08b5..39f4f691125 100644 --- a/components/automate-deployment/a1-migration/install.rb +++ b/components/automate-deployment/a1-migration/install.rb @@ -69,12 +69,17 @@ end execute "tar --strip=1 -xvf #{hab_zip_path} -C #{Chef::Config[:file_cache_path]}" -execute "#{Chef::Config[:file_cache_path]}/hab pkg install core/hab" -execute "#{Chef::Config[:file_cache_path]}/hab pkg binlink core/hab hab" + +execute "#{Chef::Config[:file_cache_path]}/hab pkg install core/hab" do + environment({"HAB_LICENSE" => "accept-no-persist"}) +end + +execute "#{Chef::Config[:file_cache_path]}/hab pkg binlink core/hab hab" do + environment({"HAB_LICENSE" => "accept-no-persist"}) +end group 'hab' user 'hab' do group 'hab' end - diff --git a/components/automate-deployment/basic-a1/install.rb b/components/automate-deployment/basic-a1/install.rb index 5abb238f243..46b3e279f35 100644 --- a/components/automate-deployment/basic-a1/install.rb +++ b/components/automate-deployment/basic-a1/install.rb @@ -63,12 +63,17 @@ end execute "tar --strip=1 -xvf #{hab_zip_path} -C #{Chef::Config[:file_cache_path]}" -execute "#{Chef::Config[:file_cache_path]}/hab pkg install core/hab" -execute "#{Chef::Config[:file_cache_path]}/hab pkg binlink core/hab hab" + +execute "#{Chef::Config[:file_cache_path]}/hab pkg install core/hab" do + environment({"HAB_LICENSE" => "accept-no-persist"}) +end + +execute "#{Chef::Config[:file_cache_path]}/hab pkg binlink core/hab hab" do + environment({"HAB_LICENSE" => "accept-no-persist"}) +end group 'hab' user 'hab' do group 'hab' end -