diff options
| author | Tim Smith <tsmith@chef.io> | 2020-12-09 16:01:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 16:01:34 -0800 |
| commit | 14f07d77d8bd3d9c3c90100c1577bfa6f80e3a11 (patch) | |
| tree | 4e24c1bb53d879539422464e23b1f5676f20fbd0 | |
| parent | a9e0a5e861c3cc49a0a0a2f522465aa1d353a8aa (diff) | |
| parent | c3a9c3064124bdc2c0012ce806285bb626a64436 (diff) | |
| download | chef-14f07d77d8bd3d9c3c90100c1577bfa6f80e3a11.tar.gz | |
Merge pull request #10719 from chef/solaris
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/release.omnibus.yml | 8 | ||||
| -rw-r--r-- | spec/integration/client/client_spec.rb | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 9b7f397a33..502380e4df 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -50,10 +50,10 @@ builder-to-testers-map: - sles-15-x86_64 sles-15-aarch64: - sles-15-aarch64 -# solaris2-5.11-i386: -# - solaris2-5.11-i386 -# solaris2-5.11-sparc: -# - solaris2-5.11-sparc + solaris2-5.11-i386: + - solaris2-5.11-i386 + solaris2-5.11-sparc: + - solaris2-5.11-sparc ubuntu-18.04-aarch64: - ubuntu-18.04-aarch64 - ubuntu-20.04-aarch64 diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb index 71f517141e..ebde310eaf 100644 --- a/spec/integration/client/client_spec.rb +++ b/spec/integration/client/client_spec.rb @@ -97,7 +97,8 @@ describe "chef-client" do before { file ".chef/knife.rb", "xxx.xxx" } it "should load .chef/knife.rb when -z is specified" do - result = shell_out("#{chef_client} -z -o 'x::default'", cwd: path_to("")) + # On Solaris shell_out will invoke /bin/sh which doesn't understand how to correctly update ENV['PWD'] + result = shell_out("#{chef_client} -z -o 'x::default'", cwd: path_to(""), env: { "PWD" => nil }) # FATAL: Configuration error NoMethodError: undefined method `xxx' for nil:NilClass expect(result.stdout).to include("xxx") end |