chef 13.11.3 → 13.12.3

data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml

@@ -1,59 +0,0 @@
-driver:
-  name: vagrant
-  forward_agent: yes
-  customize:
-    cpus: 2
-    memory: 1024
-
-provisioner:
-  name: chef_zero
-  product_name: <%= ENV["KITCHEN_CHEF_PRODUCT"] %>
-  product_version: <%= ENV["KITCHEN_CHEF_VERSION"] %>
-  channel: <%= ENV["KITCHEN_CHEF_CHANNEL"] %>
-  client_rb:
-    audit_mode: :enabled
-  attributes:
-     chef_acceptance: "true"
-     use_system_chef: "true"
-
-# busser installation relies on this
-<% if ENV["KITCHEN_CHEF_PRODUCT"] %>
-verifier:
-  chef_omnibus_root: "/opt/<%= ENV["KITCHEN_CHEF_PRODUCT"] %>"
-<% end %>
-
-platforms:
-<% %w(
-debian-8
-debian-7
-debian-6
-ubuntu-15.10
-ubuntu-14.04
-el-7
-el-6
-el-5
-freebsd-10
-freebsd-9
-fedora-21
-).each do |platform| %>
-  - name: <%= platform %>
-    driver:
-      box: opscode-<%= platform %>
-      box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_<%= platform %>_chef-provisionerless.box
-<% end %>
-# freebsd-8
-# ubuntu-12.04
-# centos-7
-  - name: centos-6
-    driver:
-      box: bento/centos-6.7
-<% %w(
-2012r2
-2012
-2008r2
-).each do |version| %>
-  - name: windows-<%= version %>
-    driver:
-      box: chef/windows-server-<%= version %>-standard
-# URL is atlas
-<% end %>

data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb

@@ -1,68 +0,0 @@
-require 'chef/mixin/shell_out'
-
-module KitchenAcceptance
-  class Kitchen < Chef::Resource
-    resource_name :kitchen
-
-    property :command, String, name_property: true
-    property :driver, %w(ec2 vagrant), coerce: proc { |v| v.to_s }, default: lazy { ENV["KITCHEN_DRIVER"] || :ec2 }
-    property :instances, String, default: lazy { ENV["KITCHEN_INSTANCES"] ? ENV["KITCHEN_INSTANCES"] : "" }
-    property :kitchen_dir, String, default: Chef.node['chef-acceptance']['suite-dir']
-    property :chef_product, String, default: lazy {
-      ENV["KITCHEN_CHEF_PRODUCT"] || begin
-        # Figure out if we're in chefdk or chef
-        if ::File.exist?(::File.expand_path("../../chef-dk.gemspec", node['chef-acceptance']['suite-dir']))
-          "chefdk"
-        else
-          "chef"
-        end
-      end
-    }
-    property :chef_channel, String, default: lazy {
-      ENV["KITCHEN_CHEF_CHANNEL"] ||
-      # Pick up current if we can't connect to artifactory
-      (ENV["ARTIFACTORY_USERNAME"] ? "unstable" : "current")
-    }
-    property :chef_version, String, default: lazy {
-      ENV["KITCHEN_CHEF_VERSION"] ||
-      # If we're running the chef or chefdk projects in jenkins, pick up the project name.
-      (ENV["PROJECT_NAME"] == chef_product ? ENV["OMNIBUS_BUILD_VERSION"] : nil) ||
-      "latest"
-    }
-    property :artifactory_username, String, default: lazy { ENV["ARTIFACTORY_USERNAME"] ? ENV["ARTIFACTORY_USERNAME"] : "" }
-    property :artifactory_password, String, default: lazy { ENV["ARTIFACTORY_PASSWORD"] ? ENV["ARTIFACTORY_PASSWORD"] : "" }
-    property :env, Hash, default: {}
-    property :kitchen_options, String, default: "-c"
-
-    action :run do
-
-      ruby_block "copy_kitchen_logs_to_data_path" do
-        block do
-          cmd_env = {
-            "KITCHEN_DRIVER" => driver,
-            "KITCHEN_INSTANCES" => instances,
-            "KITCHEN_LOCAL_YAML" => ::File.expand_path("../../.kitchen.#{driver}.yml", __FILE__),
-            "KITCHEN_CHEF_PRODUCT" => chef_product,
-            "KITCHEN_CHEF_CHANNEL" => chef_channel,
-            "KITCHEN_CHEF_VERSION" => chef_version,
-            "ARTIFACTORY_USERNAME" => artifactory_username,
-            "ARTIFACTORY_PASSWORD" => artifactory_password
-          }.merge(new_resource.env)
-          suite = kitchen_dir.split("/").last
-          kitchen_log_path = ENV["WORKSPACE"] ? "#{ENV["WORKSPACE"]}/chef-acceptance-data/logs" : "#{kitchen_dir}/../.acceptance_data/logs/"
-
-          begin
-            shell_out!("bundle exec kitchen #{command}#{instances ? " #{instances}" : ""}#{kitchen_options ? " #{kitchen_options}" : ""}",
-                       env: cmd_env,
-                       timeout: 60 * 30,
-                       live_stream: STDOUT,
-                       cwd: kitchen_dir)
-          ensure
-            FileUtils.mkdir_p("#{kitchen_log_path}/#{suite}/#{command}")
-            FileUtils.cp_r("#{kitchen_dir}/.kitchen/logs/.", "#{kitchen_log_path}/#{suite}/#{command}")
-          end
-        end
-      end
-    end
-  end
-end

data/acceptance/.shared/kitchen_acceptance/metadata.rb

@@ -1 +0,0 @@
-name "kitchen_acceptance"

data/acceptance/Gemfile

@@ -1,19 +0,0 @@
-source "https://rubygems.org"
-
-gem "rake" # required to build some native extensions
-gem "chef-acceptance", git: "https://github.com/chef/chef-acceptance.git"
-gem "kitchen-ec2"
-gem "inspec"
-gem "kitchen-vagrant"
-gem "windows_chef_zero"
-gem "kitchen-inspec"
-gem "test-kitchen"
-gem "winrm-elevated"
-gem "berkshelf"
-
-# Pin to 1.2.3 because current mixlib-install has a problem where unstable
-# packages are not always immediately available via the omnitruck API.
-gem "mixlib-install", "1.2.3"
-
-# for chef-14 development - pin to the released rubygems version
-gem "chef-config", "< 14.0"

data/acceptance/Gemfile.lock

@@ -1,266 +0,0 @@
-GIT
-  remote: https://github.com/chef/chef-acceptance.git
-  revision: 3877c344098021ac66134e8edb5eb805d14d4643
-  specs:
-    chef-acceptance (0.2.0)
-      mixlib-shellout (~> 2.0)
-      thor (~> 0.19)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.8.1)
-    aws-sdk (2.9.1)
-      aws-sdk-resources (= 2.9.1)
-    aws-sdk-core (2.9.1)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.9.1)
-      aws-sdk-core (= 2.9.1)
-    aws-sigv4 (1.0.0)
-    berkshelf (5.6.4)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 2.0.2, < 4.0)
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      buff-shell_out (~> 1.0)
-      cleanroom (~> 1.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.4)
-      octokit (~> 4.0)
-      retryable (~> 2.0)
-      ridley (~> 5.0)
-      solve (> 2.0, < 4.0)
-      thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (3.0.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      ridley (>= 4.5, < 6.0)
-    blankslate (2.1.2.4)
-    buff-config (2.0.0)
-      buff-extensions (~> 2.0)
-      varia_model (~> 0.6)
-    buff-extensions (2.0.0)
-    buff-ignore (1.2.0)
-    buff-ruby_engine (1.0.0)
-    buff-shell_out (1.1.0)
-      buff-ruby_engine (~> 1.0)
-    builder (3.2.3)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    celluloid-io (0.16.2)
-      celluloid (>= 0.16.0)
-      nio4r (>= 1.1.0)
-    chef-config (12.19.36)
-      addressable
-      fuzzyurl
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    cleanroom (1.0.0)
-    coderay (1.1.1)
-    diff-lcs (1.3)
-    docker-api (1.33.2)
-      excon (>= 0.38.0)
-      json
-    erubis (2.7.0)
-    excon (0.55.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
-    fuzzyurl (0.9.0)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (3.5.5)
-    hitimes (1.2.4)
-    httpclient (2.8.3)
-    inspec (1.18.0)
-      addressable (~> 2.5)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      json (>= 1.8, < 3.0)
-      method_source (~> 0.8)
-      mixlib-log
-      nokogiri (~> 1.6)
-      parallel (~> 1.9)
-      pry (~> 0)
-      rainbow (~> 2)
-      rspec (~> 3)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
-      sslshake (~> 1)
-      thor (~> 0.19)
-      toml (~> 0.1)
-      train (>= 0.22.0, < 1.0)
-    jmespath (1.3.1)
-    json (2.0.3)
-    kitchen-ec2 (1.3.2)
-      aws-sdk (~> 2)
-      excon
-      multi_json
-      retryable (~> 2.0)
-      test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.17.0)
-      hashie (~> 3.4)
-      inspec (>= 0.34.0, < 2.0.0)
-      test-kitchen (~> 1.6)
-    kitchen-vagrant (1.0.2)
-      test-kitchen (~> 1.4)
-    little-plugger (1.1.4)
-    logging (2.2.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitar (0.6.1)
-    mixlib-archive (0.4.1)
-      mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
-    mixlib-config (2.2.4)
-    mixlib-install (1.2.3)
-      artifactory
-      mixlib-shellout
-      mixlib-versioning
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.3.2)
-    mixlib-versioning (1.1.0)
-    molinillo (0.5.7)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    nori (2.6.0)
-    octokit (4.6.2)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.11.1)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    retryable (2.0.4)
-    ridley (5.1.0)
-      addressable
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      buff-ignore (~> 1.2)
-      buff-shell_out (~> 1.0)
-      celluloid (~> 0.16.0)
-      celluloid-io (~> 0.16.1)
-      chef-config (>= 12.5.0)
-      erubis
-      faraday (~> 0.9.0)
-      hashie (>= 2.0.2, < 4.0.0)
-      httpclient (~> 2.7)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      retryable (~> 2.0)
-      semverse (~> 2.0)
-      varia_model (~> 0.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubyntlm (0.6.1)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    semverse (2.0.0)
-    slop (3.6.0)
-    solve (3.1.0)
-      molinillo (>= 0.5)
-      semverse (>= 1.1, < 3.0)
-    sslshake (1.1.0)
-    test-kitchen (1.16.0)
-      mixlib-install (>= 1.2, < 3.0)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.19, < 0.19.2)
-    thor (0.19.1)
-    timers (4.0.4)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    train (0.23.0)
-      docker-api (~> 1.26)
-      json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    varia_model (0.6.0)
-      buff-extensions (~> 2.0)
-      hashie (>= 2.0.2, < 4.0.0)
-    windows_chef_zero (2.0.0)
-      test-kitchen (>= 1.2.1)
-    winrm (2.1.3)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  berkshelf
-  chef-acceptance!
-  chef-config (< 13.0)
-  inspec
-  kitchen-ec2
-  kitchen-inspec
-  kitchen-vagrant
-  mixlib-install (= 1.2.3)
-  rake
-  test-kitchen
-  windows_chef_zero
-  winrm-elevated
-
-BUNDLED WITH
-   1.14.6

data/acceptance/README.md

@@ -1,137 +0,0 @@
-# Acceptance Testing for Chef Client
-
-This folder contains acceptance tests that are required for Chef client release readiness.
-
-## Getting started
-
-The tests use the _chef-acceptance_ gem as the high level framework. All the gems needed to run these tests can be installed with Bundler from this directory.
-
-### Important Note!
-
-Before running chef-acceptance, you _MUST_ do the following on your current session:
-
-```shell
-export APPBUNDLER_ALLOW_RVM=true
-```
-
-## Pre-requisites / One time set up
-
-### Set up for local VM (Vagrant)
-
-If you intend to run the acceptance tests on a local VM, the supported solution is to use Vagrant. Ensure that Vagrant is installed on the machine that tests will run from, along with a virtualization driver (E.g.: VirtualBox).
-
-Set up the KITCHEN_DRIVER environment variable appropriately (value should be "vagrant"). E.g.:
-
-```shell
-export KITCHEN_DRIVER=vagrant
-```
-
-Add this to your shell profile or startup script as needed.
-
-### Set up for cloud VM (EC2)
-
-If you intend to run the acceptance tests on a cloud VM, the supported solution is to use EC2.
-
-The steps you will need to do are:
-
-1. Add your AWS credentials to the machine - e.g., to the ~/.aws/credentials directory.
-
-  - The easiest way to do this is to download the aws command line (`brew install awscli` on OS/X) and run `aws configure`.
-
-2. Create or import a SSH key to AWS. (If you already have one, you can skip the import/create)
-
-  - In the AWS console, click Key Pairs, then Create Key Pair or Import Key Pair.
-
-3. Copy or move the private key file (USERNAME.pem) to the SSH folder (e.g. `~/.ssh/USERNAME.pem`).
-
-  - If you Created a key pair in step 2, download the private key and move it to `~/.ssh`.
-  - If you Importd a key pair in step 2, just ensure your private key is in `~/.ssh` and has the same name as the key pair (`~/.ssh/USERNAME` or `~/.ssh/USERNAME.pem`).
-
-4. Set AWS_SSH_KEY_ID to the SSH key name.
-
-  - This is **optional** if your AWS SSH key name is your local username.
-  - You may want to set this in your shell `.profile`.
-
-    ```shell
-    export AWS_SSH_KEY_ID=name-of-private-key
-    ```
-
-5. Set the private key to only be readable by root
-
-  ```shell
-  chmod 0400 ~/.ssh/USERNAME.pem
-  ```
-
-6. Set up the KITCHEN_DRIVER environment variable appropriately (value should be "ec2"). (This is optional, as ec2 is the default.) E.g.:
-
-  ```shell
-  export KITCHEN_DRIVER=ec2
-  ```
-
-  Add this to your shell profile or startup script as needed.
-
-7. **Connect to Chef VPN**. The instances you create will not have public IPs!
-
-## Setting up and running a test suite
-
-To get started, do a bundle install from the acceptance directory:
-
-```shell
-chef/acceptance$ bundle install --binstubs
-```
-
-To get some basic info and ensure chef-acceptance can be run, do:
-
-```shell
-chef/acceptance$ bin/chef-acceptance info
-```
-
-To run a particular test suite, do the following:
-
-```shell
-chef/acceptance$ bin/chef-acceptance test TEST_SUITE
-```
-
-To restrict which OS's will run, use the KITCHEN_INSTANCES environment variable:
-
-```shell
-chef/acceptance$ export KITCHEN_INSTANCES=*-ubuntu-1404
-chef/acceptance$ bin/chef-acceptance test cookbook-git
-```
-
-If KITCHEN_INSTANCES is not specified, the default instances are default-ubuntu-1404 and default-windows-windows-2012r2\. All selected instances will be run in _parallel_ if the driver supports it (ec2 does, vagrant doesn't).
-
-## Optional Settings
-
-In addition to the environment settings above, there are a number of key values that are available to set for changing the way the acceptance tests are run.
-
-### KITCHEN_CHEF_CHANNEL
-
-Use this setting to specify which channel we will pull the chef build from. The default is to use the "current" channel, unless the ARTIFACTORY_USERNAME is set (which normally happens when running under Jenkins), in which case the default is changed to "unstable".
-
-```shell
-export KITCHEN_CHEF_CHANNEL=name-of-channel
-```
-
-### KITCHEN_CHEF_VERSION
-
-Use this setting to override the version of the Chef client that is installed. The default is to get the latest version in the desired channel.
-
-```shell
-export KITCHEN_CHEF_VERSION=version-of-chef-client
-```
-
-### ARTIFACTORY_USERNAME / ARTIFACTORY_PASSWORD
-
-If the desired channel to get the Chef client from is "unstable", the following settings need to be exported:
-
-```shell
-export ARTIFACTORY_USERNAME=username
-export ARTIFACTORY_PASSWORD=password
-```
-
-## Future Work
-
-Currently, there is no simple mechanism for chef-acceptance to build an Omnibus package of the developers local chef instance and run acceptance tests on it - the only packages that can be exercised are ones that come from one of the pipeline channels (unstable, current or stable).
-
-This is not an issue when adding acceptance tests for pre-existing functionality (as that functionality is presumed to already be in a build in one of the pipeline channels).