Merge pull request #6523 from chef/fedora_testing

Enable Fedora integration testing in Travis

7 files changed, 26 insertions, 142 deletions

diff --git a/.travis.yml b/.travis.yml
index 8e52f38611..80effc9fcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -217,24 +217,24 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.4.2
-#    services: docker
-#    sudo: required
-#    gemfile: kitchen-tests/Gemfile
-#    before_install:
-#      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-#      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-#    before_script:
-#      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-#      - cd kitchen-tests
-#    script:
-#      - bundle exec kitchen test base-fedora-latest
-#    after_failure:
-#      - cat .kitchen/logs/kitchen.log
-#    env:
-#      - FEDORA=latest
-#      - KITCHEN_YAML=.kitchen.travis.yml
+  - rvm: 2.4.2
+    services: docker
+    sudo: required
+    gemfile: kitchen-tests/Gemfile
+    before_install:
+     - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+     - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
+    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+    before_script:
+     - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+     - cd kitchen-tests
+    script:
+     - bundle exec kitchen test base-fedora-latest
+    after_failure:
+     - cat .kitchen/logs/kitchen.log
+    env:
+     - FEDORA=latest
+     - KITCHEN_YAML=.kitchen.travis.yml
 # - rvm: 2.4.2
 #   services: docker
 #   sudo: required
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 720f034cb5..7c00fdaeed 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -61,9 +61,6 @@ platforms:
     intermediate_instructions:
       - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
-  attributes:
-    chef_client:
-      init_style: init
 
 - name: centos-7
   driver:
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 4e570b125e..bb9791de90 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -17,7 +17,6 @@ provisioner:
   github_repo: "chef"
   ohai_refname: "master"
   refname: <%= %x(git rev-parse HEAD) %>
-  data_path: test/fixtures
   client_rb:
     diff_disabled: true
 
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 6cd1308fcd..98eaf17ca3 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -22,24 +22,23 @@ GRAPH
   build-essential (8.0.3)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (8.1.8)
-    cron (>= 2.0.0)
+  chef-client (9.0.2)
+    cron (>= 4.2.0)
     logrotate (>= 1.9.0)
     windows (>= 2.0.0)
   chef_hostname (0.6.1)
   compat_resource (12.19.0)
-  cron (4.1.3)
-    compat_resource (>= 0.0.0)
-  iptables (4.2.1)
+  cron (5.0.1)
+  iptables (4.3.1)
   logrotate (2.2.0)
   mingw (2.0.1)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
   nscd (5.0.0)
-  ntp (3.5.2)
+  ntp (3.5.4)
   ohai (5.2.0)
-  openssh (2.5.0)
+  openssh (2.6.0)
     iptables (>= 1.0)
   resolver (2.0.1)
   selinux (2.1.0)
@@ -48,6 +47,6 @@ GRAPH
   sudo (3.5.3)
   ubuntu (2.0.1)
     apt (>= 0.0.0)
-  users (5.1.0)
-  windows (3.1.2)
+  users (5.2.1)
+  windows (3.4.0)
     ohai (>= 4.0.0)
diff --git a/kitchen-tests/cookbooks/audit_test/.gitignore b/kitchen-tests/cookbooks/audit_test/.gitignore
deleted file mode 100644
index 1e074046f0..0000000000
--- a/kitchen-tests/cookbooks/audit_test/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.vagrant
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-.kitchen/
-.kitchen.local.yml
diff --git a/kitchen-tests/cookbooks/audit_test/chefignore b/kitchen-tests/cookbooks/audit_test/chefignore
deleted file mode 100644
index 80dc2d20ef..0000000000
--- a/kitchen-tests/cookbooks/audit_test/chefignore
+++ /dev/null
@@ -1,95 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# or sharing to the community site.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-Icon?
-nohup.out
-ehthumbs.db
-Thumbs.db
-
-# SASS #
-########
-.sass-cache
-
-# EDITORS #
-###########
-\#*
-.#*
-*~
-*.sw[a-z]
-*.bak
-REVISION
-TAGS*
-tmtags
-*_flymake.*
-*_flymake
-*.tmproj
-.project
-.settings
-mkmf.log
-
-## COMPILED ##
-##############
-a.out
-*.o
-*.pyc
-*.so
-*.com
-*.class
-*.dll
-*.exe
-*/rdoc/
-
-# Testing #
-###########
-.watchr
-.rspec
-spec/*
-spec/fixtures/*
-test/*
-features/*
-Guardfile
-Procfile
-
-# SCM #
-#######
-.git
-*/.git
-.gitignore
-.gitmodules
-.gitconfig
-.gitattributes
-.svn
-*/.bzr/*
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Cookbooks #
-#############
-CONTRIBUTING
-
-# Strainer #
-############
-Colanderfile
-Strainerfile
-.colander
-.strainer
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
-
-# Travis #
-##########
-.travis.yml
diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/base/attributes/default.rb
index 75e57cb27b..e22dfa9fae 100644
--- a/kitchen-tests/cookbooks/base/attributes/default.rb
+++ b/kitchen-tests/cookbooks/base/attributes/default.rb
@@ -43,7 +43,6 @@ default["openssh"]["server"]["challenge_response_authentication"] = "no"
 default["openssh"]["server"]["kerberos_authentication"] = "no"
 # tcp keepalives are useful to keep connections up through VPNs and firewalls
 default["openssh"]["server"]["tcp_keepalive"] = "yes"
-default["openssh"]["server"]["use_privilege_separation"] = "yes"
 default["openssh"]["server"]["max_start_ups"] = "10"
 # PAM (i think) already prints the motd on login
 default["openssh"]["server"]["print_motd"] = "no"