Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Set correct product and windows architecture for acceptance tests #752

Merged
merged 3 commits into from
Mar 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ Vagrantfile

# Test Kitchen
.kitchen/

# Chef-Acceptance
acceptance/Gemfile.lock
.acceptance_logs
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gemspec :name => "chef-dk"

# Chef 12.8.1 Gem includes some extra files which can break gem installation on
# windows. For now we are pulling chef from github at the tag as a workaround.
gem "chef", github: "chef", tag: "12.8.1"
gem "chef", github: "chef", tag: "v12.8.7"

group(:dev) do
gem 'guard'
Expand Down
8 changes: 6 additions & 2 deletions acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ platforms:
transport:
username: administrator

- name: windows-2012
- name: windows-2012r2
provisioner:
architecture: <%= ENV["KITCHEN_CHEF_WIN_ARCHITECTURE"] %>
driver:
image_search:
name: Windows_Server-2012-RTM*-English-*-Base-*
Expand All @@ -234,7 +236,9 @@ platforms:
image-type: machine
transport:
username: administrator
- name: windows-2008r2
- name: windows-2012r2
provisioner:
architecture: <%= ENV["KITCHEN_CHEF_WIN_ARCHITECTURE"] %>
driver:
image_search:
name: Windows_Server-2008-R2*-English-*-Base-*
Expand Down
8 changes: 4 additions & 4 deletions ci/verify-chefdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ if [ "x$ACCEPTANCE" != "x" ]; then

set -e

# cd /opt/chefdk/embedded/lib/ruby/gems/*/gems/chef-[0-9]*/acceptance
# sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle install
# sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test
cd /opt/chefdk/embedded/lib/ruby/gems/*/gems/chef-[0-9]*/acceptance
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle install
sudo env KITCHEN_CHEF_PRODUCT=chefdk KITCHEN_CHEF_WIN_ARCHITECTURE=i386 PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test top-cookbooks --force-destroy

cd /opt/$PROJECT_NAME/embedded/lib/ruby/gems/*/gems/chef-dk-[0-9]*/acceptance
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle install
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test --force-destroy
sudo env KITCHEN_CHEF_PRODUCT=chefdk KITCHEN_CHEF_WIN_ARCHITECTURE=i386 PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test --force-destroy
else
export PATH=/opt/chefdk/bin:$PATH

Expand Down
1 change: 0 additions & 1 deletion omnibus/config/chefdk_gem_overrides.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
override :berkshelf, :version => "v4.3.1"
override :bundler, :version => "1.11.2"
override :chef, :version => "12.8.1"
override :"chef-provisioning", :version => "v1.6.0"
override :"chef-provisioning-aws", :version => "v1.8.0"
override :"chef-provisioning-azure", :version => "v0.5.0"
Expand Down
31 changes: 16 additions & 15 deletions omnibus/config/projects/chefdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,28 @@
instance_eval(IO.read(overrides_file), overrides_file, 1)

# Lower level library pins
override :libedit, version: "20130712-3.1"
#override :"libffi", version: "3.2.1"
#override :"libiconv", version: "1.14"
#override :"liblzma", version: "5.2.2"
override :chef, version: "v12.8.7"
override :libedit, version: "20130712-3.1"
## according to comment in omnibus-sw, latest versions don't work on solaris
# https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
override :libtool, version: "2.4.2"
# override :libxml2, version: "2.9.3"
override :libxslt, version: "1.1.28"
override :makedepend, version: "1.0.5"
#override :"ncurses", version: "5.9"
#override :"pkg-config-lite", version: "0.28-1"
override :libtool, version: "2.4.2"
override :libxslt, version: "1.1.28"
override :makedepend, version: "1.0.5"
override :rubocop, version: "v0.37.2"
override :ruby, version: "2.1.8"
override :rubygems, version: "2.5.2"
override :"util-macros", version: "1.19.0"
override :xproto, version: "7.0.28"
#override :"libyaml", version: "0.1.6"
override :yajl, version: "1.2.1"
override :zlib, version: "1.2.8"
override :"util-macros", version: "1.19.0"
override :xproto, version: "7.0.28"
override :yajl, version: "1.2.1"
override :zlib, version: "1.2.8"

# override :"libffi", version: "3.2.1"
# override :"libiconv", version: "1.14"
# override :"liblzma", version: "5.2.2"
# override :libxml2, version: "2.9.3"
# override :"ncurses", version: "5.9"
# override :"pkg-config-lite", version: "0.28-1"
# override :"libyaml", version: "0.1.6"

## These can float as they are frequently updated in a way that works for us
#override :"cacerts", # probably best to float?
Expand Down