From 31cc9214a97e093061541915b8116b5e2fc987b2 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Wed, 6 Nov 2024 13:30:44 +0530 Subject: [PATCH] Fixed the specs Signed-off-by: Ashique Saidalavi --- .expeditor/habitat-test.pipeline.yml | 1 + .expeditor/verify.pipeline.yml | 8 ++++++++ lib/kitchen/provisioner/chef_base.rb | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index da3af8d02..afc6244e4 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -32,3 +32,4 @@ steps: - FORCE_FFI_YAJL=ext - EXPIRE_CACHE=true - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 8b6d77356..f900c5548 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -17,6 +17,9 @@ steps: executor: docker: image: ruby:3.1 + environment: + - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ - label: run-specs-ruby-3.3 command: @@ -25,6 +28,9 @@ steps: executor: docker: image: ruby:3.3 + environment: + - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ - label: run-specs-windows-ruby-3.1 command: @@ -40,6 +46,7 @@ steps: - FORCE_FFI_YAJL=ext - EXPIRE_CACHE=true - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ - label: run-specs-windows-ruby-3.3 command: @@ -55,3 +62,4 @@ steps: - FORCE_FFI_YAJL=ext - EXPIRE_CACHE=true - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ diff --git a/lib/kitchen/provisioner/chef_base.rb b/lib/kitchen/provisioner/chef_base.rb index 832d3304f..5c41fe0e6 100644 --- a/lib/kitchen/provisioner/chef_base.rb +++ b/lib/kitchen/provisioner/chef_base.rb @@ -590,7 +590,7 @@ def install_from_file(command) def script_for_omnibus_version require "mixlib/install/script_generator" opts = install_options - opts[:omnibus_url] = config[:install_sh_url] + opts[:omnibus_url] = config[:install_sh_url] if config[:install_sh_url] installer = Mixlib::Install::ScriptGenerator.new( config[:require_chef_omnibus], powershell_shell?, opts )