diff options
| -rw-r--r-- | .expeditor/scripts/bk_win_functional.ps1 | 2 | ||||
| -rw-r--r-- | .expeditor/scripts/ensure-minimum-viable-hab.ps1 | 23 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 14 | ||||
| -rw-r--r-- | Gemfile.lock | 38 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb | 16 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 3 | ||||
| -rw-r--r-- | knife/lib/chef/knife/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 41 | ||||
| -rw-r--r-- | spec/functional/shell_spec.rb | 6 | ||||
| -rw-r--r-- | spec/unit/daemon_spec.rb | 6 |
16 files changed, 90 insertions, 74 deletions
diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1 index 8b4a445b44..a2f93378dd 100644 --- a/.expeditor/scripts/bk_win_functional.ps1 +++ b/.expeditor/scripts/bk_win_functional.ps1 @@ -11,7 +11,7 @@ Write-Output "--- Enable Ruby 2.7" Write-Output "Register Installed Ruby Version 2.7 With Uru" Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait -uru 271 +uru 27 if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" } ruby -v if (-not $?) { throw "Can't run Ruby. Is it installed?" } diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 index 10bfeb0fa8..96ec67142d 100644 --- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 +++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 @@ -1,8 +1,17 @@ -[Version]$hab_version = (hab --version).split(" ")[1].split("/")[0] -if ($hab_version -lt [Version]"0.85.0" ) { - Write-Host "--- :habicat: Installing the version of Habitat required" - install-habitat --version 0.85.0.20190916 - if (-not $?) { throw "Hab version is older than 0.85 and could not update it." } -} else { - Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed" +try { + [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0] + if ($hab_version -lt [Version]"0.85.0" ) { + Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1')) + $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + if (-not $?) { throw "Hab version is older than 0.85 and could not update it." } + } else { + Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed" + } +} +catch { + Write-Host "--- :habicat: Forcing an install of habitat" + Set-ExecutionPolicy Bypass -Scope Process -Force + choco feature enable -n=allowGlobalConfirmation + choco install habitat + $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + ";C:\ProgramData\Habitat\" } diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index f0e2b3183c..0f1c66abbe 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -175,6 +175,7 @@ steps: - label: "Integration openSUSE 15 :ruby: 3.0" commands: + - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" - /workdir/.expeditor/scripts/bk_container_prep.sh - zypper install -y cron insserv-compat - cd /workdir; bundle config set --local without omnibus_package @@ -189,6 +190,7 @@ steps: - label: "Functional openSUSE 15 :ruby: 3.0" commands: + - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" - /workdir/.expeditor/scripts/bk_container_prep.sh - zypper install -y cronie insserv-compat - zypper install -y libarchive-devel @@ -204,6 +206,7 @@ steps: - label: "Unit openSUSE 15 :ruby: 3.0" commands: + - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" - /workdir/.expeditor/scripts/bk_container_prep.sh - zypper install -y cron insserv-compat libarchive-devel - bundle config set --local without omnibus_package diff --git a/CHANGELOG.md b/CHANGELOG.md index bd65c8c65d..8287f16e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,25 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 17.10.19 --> -## [v17.10.19](https://github.com/chef/chef/tree/v17.10.19) (2022-06-14) +<!-- latest_release 17.10.27 --> +## [v17.10.27](https://github.com/chef/chef/tree/v17.10.27) (2022-10-21) #### Merged Pull Requests -- Backport to 17: Stop executing locale-gen on every chef run [#12905](https://github.com/chef/chef/pull/12905) ([hrak](https://github.com/hrak)) +- [chef-17] Update omnibus version to fix read_shared_libs to fix solaris adhoc pipeline issue [#13243](https://github.com/chef/chef/pull/13243) ([blabade](https://github.com/blabade)) <!-- latest_release --> <!-- release_rollup since=17.10.0 --> ### Changes not yet released to stable #### Merged Pull Requests +- [chef-17] Update omnibus version to fix read_shared_libs to fix solaris adhoc pipeline issue [#13243](https://github.com/chef/chef/pull/13243) ([blabade](https://github.com/blabade)) <!-- 17.10.27 --> +- [Chef-17] Correcting for Hab not being installed [#13266](https://github.com/chef/chef/pull/13266) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.26 --> +- Bump omnibus from `83d8428` to `d1fe3bb` in /omnibus [#13274](https://github.com/chef/chef/pull/13274) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.10.25 --> +- [Chef-17] Backporting the fix from Chef-18 to get uru to work correctly [#13261](https://github.com/chef/chef/pull/13261) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.24 --> +- [Chef-17] Backporting a fix for the Linux testers that fixes a resolver_conf issue [#13257](https://github.com/chef/chef/pull/13257) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.23 --> +- [Chef-17] Backporting a fix for the Linux testers that fixes an issue with nscd… [#13258](https://github.com/chef/chef/pull/13258) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.22 --> +- [Chef-17] Adding a new Zypper repo with a higher priority [#13255](https://github.com/chef/chef/pull/13255) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.21 --> +- Update self-signed.badssl.com cert for chef-17 [#13231](https://github.com/chef/chef/pull/13231) ([blabade](https://github.com/blabade)) <!-- 17.10.20 --> - Backport to 17: Stop executing locale-gen on every chef run [#12905](https://github.com/chef/chef/pull/12905) ([hrak](https://github.com/hrak)) <!-- 17.10.19 --> - backport-17: Fix error 'error validating X-Vault-AWS-IAM-Server-ID header: missing header X-Vault-AWS-IAM-Server-ID' in Hashi Vault secret manager for AWS IAM auth method [#12957](https://github.com/chef/chef/pull/12957) ([neha-p6](https://github.com/neha-p6)) <!-- 17.10.18 --> - Backport to 17: Add rubygems_url property to chef_client_config resource [#12978](https://github.com/chef/chef/pull/12978) ([DecoyJoe](https://github.com/DecoyJoe)) <!-- 17.10.17 --> diff --git a/Gemfile.lock b/Gemfile.lock index ef8ea30eab..62da08ad44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.10.19) + chef (17.10.27) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.19) - chef-utils (= 17.10.19) + chef-config (= 17.10.27) + chef-utils (= 17.10.27) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,13 +66,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.10.19-universal-mingw32) + chef (17.10.27-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.19) + chef-config (= 17.10.27) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.19) + chef-utils (= 17.10.27) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -113,15 +113,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.10.19) - chef (= 17.10.19) + chef-bin (17.10.27) + chef (= 17.10.27) PATH remote: chef-config specs: - chef-config (17.10.19) + chef-config (17.10.27) addressable - chef-utils (= 17.10.19) + chef-utils (= 17.10.27) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -130,7 +130,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.10.19) + chef-utils (17.10.27) concurrent-ruby GEM @@ -143,23 +143,23 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.598.0) - aws-sdk-core (3.131.1) + aws-partitions (1.649.0) + aws-sdk-core (3.163.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) + aws-sdk-s3 (1.115.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.62.0) + aws-sdk-secretsmanager (1.66.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -192,7 +192,7 @@ GEM debug_inspector (1.1.0) diff-lcs (1.5.0) ed25519 (1.3.0) - erubi (1.10.0) + erubi (1.11.0) erubis (2.7.0) faraday (1.4.3) faraday-em_http (~> 1.0) @@ -471,4 +471,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.3.18 @@ -1 +1 @@ -17.10.19
\ No newline at end of file +17.10.27
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 22c3122c3e..71909fe00c 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "17.10.19".freeze + VERSION = "17.10.27".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 65455d6399..c35ff9c86b 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "17.10.19".freeze + VERSION = "17.10.27".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 21b6f2ae0c..7af9c74051 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.10.19" + VERSION = "17.10.27" end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb index e719a01837..e085519c4a 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb @@ -1,10 +1,10 @@ chef_client_trusted_certificate "self-signed.badssl.com" do certificate <<~CERT -----BEGIN CERTIFICATE----- -MIIDeTCCAmGgAwIBAgIJALvxdCPEMG1VMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV +MIIDeTCCAmGgAwIBAgIJAMtEwC/G1C5xMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y -MjA1MTcyMTE1MjVaFw0yNDA1MTYyMTE1MjVaMGIxCzAJBgNVBAYTAlVTMRMwEQYD +MjA4MTIxNTU5MTBaFw0yNDA4MTExNTU5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2 @@ -14,12 +14,12 @@ xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI -hvcNAQELBQADggEBAI8cPgdGNaXwomKxzksJPMCHQC3zkTKQBqGAk4yWp3w7/WHV -1dTz/ezCH1UpxRUqTIZ/jS7OwrERRJCw6wr84WrKj0TKgZI00LEoRg3eK+U5QJj1 -4HZ8UTVkYL7OhPBanGgACw0eOvFtLdwizBTAw+B79Uzx0j84babX8HFq8UJR997H -FN+Fo9w4+ObXiA6BB9+fsqhRKPcIvt4HI6eQ4S/5lBkZbhHIPSR5oy4y7AsnZeb8 -hFNhP/WPdRvk4za0cAkuhoY5/3A/U4eFrXYL4N8mhqiRWvqbSaBT2YnlbSVxEDQM -CJWRCL+Lq4ZHGYgXSi1T0/LJHSlOa1F5qhZpk9A= +hvcNAQELBQADggEBAKgnD+Ak7ttVfKvriYAsf4ttTYfOuyLfAr4hTTSXLN2u1ySD +fIpqSyeOkiEwfD5Bt7C/muEXEIyG/y6/C/ozb5JBvdd8c7zicLmaHtZtZbj4+H1b +/gqaBHuvWxiRR91bbgNaKsPMGCWiAvUt4/+y8z6xefUS+aKeFNhYjdwyFIr17j3Q +gxGpgCbYLLIoewP+Oj6xvZgGl6vj0xW9a4144xjFo1o1vqWkj+3IZGmnZ/jyznWd +5XzZCUaM9z6nn7NVxQZEelk885Q3oUxY96rRO+IUA8Vnk3iEtOdZPbNBaZwvgkfz +4vhvM8gKbdeeWoOAJDLzDZiDrUpKtIkBcLuJ7Cw= -----END CERTIFICATE----- CERT end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index c08bc4ee2e..9f452c00dc 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -43,6 +43,7 @@ include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP resolver_config "/etc/resolv.conf" do nameservers [ "8.8.8.8", "8.8.4.4" ] search [ "chef.io" ] + atomic_update false # otherwise EBUSY for linux docker containers end users_from_databag = search("users", "*:*") @@ -57,7 +58,7 @@ ssh_known_hosts_entry "github.com" include_recipe "openssh" -include_recipe "nscd" +include_recipe "nscd" unless fedora? # fedora 34+ doesn't have nscd logrotate_package "logrotate" diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 1b709b9891..471c11a3d8 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.10.19".freeze + VERSION = "17.10.27".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 1dcb6e3a35..2ec4d353d9 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("17.10.19") + VERSION = Chef::VersionString.new("17.10.27") end # diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index bacbcbffbd..4210d718b3 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: 83d8428abde4cb289a161f736822ba02563a884c + revision: 5bc091ab3ed4ab002ef85dad3923914c25bb3dcd branch: main specs: - omnibus (9.0.3) + omnibus (9.0.8) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-utils (>= 15.4) @@ -29,32 +29,30 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.590.0) - aws-sdk-core (3.131.1) + aws-partitions (1.648.0) + aws-sdk-core (3.162.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) + aws-sdk-s3 (1.115.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.61.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) - bcrypt_pbkdf (1.1.0-x64-mingw32) - bcrypt_pbkdf (1.1.0-x86-mingw32) berkshelf (8.0.1) chef (>= 15.7.32) chef-config @@ -248,7 +246,7 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.1) + license_scout (1.3.2) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -264,7 +262,7 @@ GEM mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb mixlib-install (3.12.16) mixlib-shellout @@ -278,15 +276,10 @@ GEM ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.2.7-x64-mingw-ucrt) - chef-utils - ffi-win32-extensions (~> 1.0.3) - win32-process (~> 0.9) - wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-sftp (3.0.0) @@ -326,7 +319,7 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.7) + public_suffix (5.0.0) rack (2.2.3) rainbow (3.1.1) retryable (3.0.5) @@ -381,16 +374,16 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (1.2.1) - toml-rb (2.1.2) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.9.2) + train-core (3.10.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 7.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) diff --git a/spec/functional/shell_spec.rb b/spec/functional/shell_spec.rb index 2289df3ef1..bd3dc16218 100644 --- a/spec/functional/shell_spec.rb +++ b/spec/functional/shell_spec.rb @@ -80,6 +80,12 @@ describe Shell do # so hide the require here require "pty" + + # FIXME this is temporary... Solaris envs have TERM set to unknown + # and the value isn't propagating from the build environment TERM + # variable + ENV["TERM"] = "vt100" if ["", "unknown"].include?(ENV["TERM"].to_s) + config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA) reader, writer, pid = PTY.spawn("bundle exec chef-shell --no-multiline --no-singleline --no-colorize -c #{config} #{options}") read_until(reader, "chef (#{Chef::VERSION})>") diff --git a/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb index f91210277b..05a09a5857 100644 --- a/spec/unit/daemon_spec.rb +++ b/spec/unit/daemon_spec.rb @@ -170,11 +170,7 @@ describe Chef::Daemon do it "should log an appropriate error message and fail miserably" do allow(Process).to receive(:initgroups).and_raise(Errno::EPERM) - error = "Operation not permitted" - if RUBY_PLATFORM.match("solaris2") || RUBY_PLATFORM.match("aix") - error = "Not owner" - end - expect(Chef::Application).to receive(:fatal!).with("Permission denied when trying to change 999:999 to 501:20. #{error}") + expect(Chef::Application).to receive(:fatal!).with(/Permission denied when trying to change 999:999 to 501:20/) Chef::Daemon._change_privilege(testuser) end end |