summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-02-10 23:19:55 -0700
committertyler-ball <tyleraball@gmail.com>2016-02-10 23:19:55 -0700
commitc6ba80a6acd07cdeb89da6a7f61d6a8849e93851 (patch)
tree1c00eae85b30fe1941e24888109ba71c8ed8db29
parentd22efaa11063e1a4dc54b71db2cf917b6b7fa140 (diff)
downloadchef-c6ba80a6acd07cdeb89da6a7f61d6a8849e93851.tar.gz
12.7.2 release prep, removing some unstable acceptance tests so we can get a successful release pipeline runno_more_learnchef_acceptance
-rw-r--r--CHANGELOG.md4
-rw-r--r--VERSION2
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb19
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 17 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 809a965d8e..46861bf83e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 12.7.2
+
+* [pr#4559](https://github.com/chef/chef/pull/4559) Remove learnchef acceptance tests until we make them more reliable
+
## 12.7.1
* [**Daniel Steen**](https://github.com/dansteen)
* [pr#3183](https://github.com/chef/chef/pull/3183) Provide more helpful error message when accidentally using --secret instead of --secret-file
diff --git a/VERSION b/VERSION
index 86270ea610..a028d1437c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.1
+12.7.2
diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
index aed81f073b..5989bd060a 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -7,14 +7,15 @@ class TopCookbooks < Chef::Resource
cookbook_kitchen "#{command} git" do
end
- cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
- repository "learn-chef/learn-chef-acceptance"
- cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
- end
-
- cookbook_kitchen "#{command} learn-the-basics-windows" do
- repository "learn-chef/learn-chef-acceptance"
- cookbook_relative_dir "cookbooks/learn-the-basics-windows"
- end
+ # https://github.com/learn-chef/learn-chef-acceptance/pull/10
+ # cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
+ # repository "learn-chef/learn-chef-acceptance"
+ # cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
+ # end
+ #
+ # cookbook_kitchen "#{command} learn-the-basics-windows" do
+ # repository "learn-chef/learn-chef-acceptance"
+ # cookbook_relative_dir "cookbooks/learn-the-basics-windows"
+ # end
end
end
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 1ca332defb..2e54dd3d80 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.dirname(File.expand_path(File.dirname(__FILE__)))
- VERSION = "12.7.1"
+ VERSION = "12.7.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 166ecf33d1..ed80b186d9 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
- VERSION = "12.7.1"
+ VERSION = "12.7.2"
end
#