summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2016-02-05 09:54:31 -0500
committerBryan McLellan <btm@loftninjas.org>2016-02-05 09:54:31 -0500
commitdc7a6d3efda0fa8f77b9b43e9f2efd828bd3edae (patch)
treeefb2bb07012c17c9eb34377f43097871345f8d50
parent328b16aa75ce8dc49cb8f7b18900d3c68148b789 (diff)
parent2dbed77bc748627c21be1025be6ba58057e28579 (diff)
downloadchef-dc7a6d3efda0fa8f77b9b43e9f2efd828bd3edae.tar.gz
Merge pull request #4530 from chef/ksubrama/ci
Remove obsolete reference to chef-13. Add VERSION to gemspec.
-rw-r--r--chef.gemspec2
-rwxr-xr-xci/verify-chef.bat12
2 files changed, 4 insertions, 10 deletions
diff --git a/chef.gemspec b/chef.gemspec
index 168279d99a..d74138db0e 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -54,5 +54,5 @@ Gem::Specification.new do |s|
s.executables = %w{ chef-client chef-solo knife chef-shell chef-apply }
s.require_paths = %w{ lib lib-backcompat }
- s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec")
+ s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec")
end
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat
index 2c16eb83f6..c8f9d3573c 100755
--- a/ci/verify-chef.bat
+++ b/ci/verify-chef.bat
@@ -47,13 +47,7 @@ IF NOT EXIST "Gemfile.lock" (
GOTO :error
)
-IF "%PIPELINE_NAME%" == "chef-13" (
- REM ; Running unit and functional tests
- call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional
-) ELSE (
- REM ; Running unit tests
- IF "%PIPELINE_NAME%" == "chef-fips" (
- set CHEF_FIPS=1
- )
- call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional
+IF "%PIPELINE_NAME%" == "chef-fips" (
+ set CHEF_FIPS=1
)
+call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional