summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.expeditor/release.omnibus.yml4
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/provider/package/zypper.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/provider/package/zypper_spec.rb9
9 files changed, 26 insertions, 19 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index fba2415f1b..a4c25859eb 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -36,10 +36,6 @@ builder-to-testers-map:
- mac_os_x-10.12-x86_64
- mac_os_x-10.13-x86_64
- mac_os_x-10.14-x86_64
- sles-11-s390x:
- - sles-11-s390x
- sles-11-x86_64:
- - sles-11-x86_64
sles-12-s390x:
- sles-12-s390x
sles-12-x86_64:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb8a1a10e8..15fc131458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.2.12 -->
-## [v15.2.12](https://github.com/chef/chef/tree/v15.2.12) (2019-08-05)
+<!-- latest_release 15.2.14 -->
+## [v15.2.14](https://github.com/chef/chef/tree/v15.2.14) (2019-08-07)
#### Merged Pull Requests
-- Cleanup of habitat/plan.sh for chef-infra-client [#8789](https://github.com/chef/chef/pull/8789) ([afiune](https://github.com/afiune))
+- zypper_package upgrade action not working [#8462](https://github.com/chef/chef/pull/8462) ([foobarbam](https://github.com/foobarbam))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- zypper_package upgrade action not working [#8462](https://github.com/chef/chef/pull/8462) ([foobarbam](https://github.com/foobarbam)) <!-- 15.2.14 -->
+- Stop building Chef Infra Client on SLES 11 [#8796](https://github.com/chef/chef/pull/8796) ([tas50](https://github.com/tas50)) <!-- 15.2.13 -->
- Cleanup of habitat/plan.sh for chef-infra-client [#8789](https://github.com/chef/chef/pull/8789) ([afiune](https://github.com/afiune)) <!-- 15.2.12 -->
- Bump inspec-core-bin to 4.10.4 and Ohai to 15.2.4 [#8788](https://github.com/chef/chef/pull/8788) ([chef-ci](https://github.com/chef-ci)) <!-- 15.2.11 -->
- Remove Travis / Jenkins config / docs [#8786](https://github.com/chef/chef/pull/8786) ([tas50](https://github.com/tas50)) <!-- 15.2.10 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cc861ecbec..5a0b702e8f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.12)
+ chef (15.2.14)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.12)
+ chef-config (= 15.2.14)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.2.12-universal-mingw32)
+ chef (15.2.14-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.12)
+ chef-config (= 15.2.14)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.2.12)
- chef (= 15.2.12)
+ chef-bin (15.2.14)
+ chef (= 15.2.14)
PATH
remote: chef-config
specs:
- chef-config (15.2.12)
+ chef-config (15.2.14)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index fc2b06ae78..9dbcdd141a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.12 \ No newline at end of file
+15.2.14 \ 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 4bf058cdeb..545db78852 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("../..", __FILE__)
- VERSION = "15.2.12".freeze
+ VERSION = "15.2.14".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 048ef74da1..2f9746986d 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.2.12".freeze
+ VERSION = "15.2.14".freeze
end
#
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index a828da1c6c..6d464a1930 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -49,7 +49,7 @@ class Chef
logger.trace("#{new_resource} out of date version #{current_version}")
end
end
- current_version = candidate_version if is_installed
+ current_version ||= candidate_version if is_installed
{ current_version: current_version, candidate_version: candidate_version }
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 31dc81f403..74b1920818 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("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.2.12")
+ VERSION = Chef::VersionString.new("15.2.14")
end
#
diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index a8ab2a0b37..6b64db2fbf 100644
--- a/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
@@ -112,6 +112,15 @@ describe Chef::Provider::Package::Zypper do
expect(provider.candidate_version).to eql(["1.0"])
end
+ it "should have differing current and candidate versions if zypper detects an upgrade" do
+ status = double(stdout: "Version : 1.0 \nInstalled : Yes \nStatus : out-of-date (version 0.9 installed)", exitstatus: 0)
+
+ allow(provider).to receive(:shell_out_compacted!).and_return(status)
+ provider.load_current_resource
+ expect(provider.get_current_versions).to eq(["0.9"])
+ expect(provider.get_candidate_versions).to eq(["1.0"])
+ end
+
it "should return the current resouce" do
expect(provider.load_current_resource).to eql(current_resource)
end
View Lorry Controller Status