diff options
| author | Tim Smith <tsmith@chef.io> | 2017-10-17 16:04:25 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2017-10-20 12:51:56 -0700 |
| commit | c8afb824e236b2ccd80b2bcdd9c665436197eabd (patch) | |
| tree | edbb2cfbe608954ff2eb5f6feafd30bc8d2aec04 | |
| parent | 8f88c8f311aed23baa6f8b8495719a004d6eb7e6 (diff) | |
| download | chef-c8afb824e236b2ccd80b2bcdd9c665436197eabd.tar.gz | |
Rename the learnchef suites
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/base/attributes/default.rb | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b8ef5d900d..6b4fea8ae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -265,11 +265,11 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: - - bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404 + - bundle exec kitchen test learnchef-ubuntu-1404 after_failure: - cat .kitchen/logs/kitchen.log env: - - AWESOME_CUSTOMERS_UBUNTU=1 + - LEARNCHEF_UBUNTU=1 - KITCHEN_YAML=.kitchen.travis.yml - rvm: 2.4.2 services: docker @@ -283,11 +283,11 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: - - bundle exec kitchen test awesome-customers-rhel-centos-7 + - bundle exec kitchen test learnchef-centos-7 after_failure: - cat .kitchen/logs/kitchen.log env: - - AWESOME_CUSTOMERS_RHEL=1 + - LEARNCHEF_RHEL=1 - KITCHEN_YAML=.kitchen.travis.yml # ### END TEST KITCHEN ONLY ### diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 45d9eb89f1..07115dc237 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -111,7 +111,7 @@ suites: - name: base run_list: - recipe[base::default] - - name: learnchef_lamp + - name: learnchef run_list: - recipe[lamp::default] data_bags_path: data_bags diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml index af680acbf8..40d2d8d14c 100644 --- a/kitchen-tests/.kitchen.yml +++ b/kitchen-tests/.kitchen.yml @@ -31,7 +31,7 @@ suites: - name: base run_list: - recipe[base::default] - - name: learnchef_lamp + - name: learnchef run_list: - recipe[lamp::default] data_bags_path: data_bags diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/base/attributes/default.rb index 75e57cb27b..0fd3855a6c 100644 --- a/kitchen-tests/cookbooks/base/attributes/default.rb +++ b/kitchen-tests/cookbooks/base/attributes/default.rb @@ -43,7 +43,7 @@ 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"]["use_privilege_separation"] = "yes" unless platform?("fedora") default["openssh"]["server"]["max_start_ups"] = "10" # PAM (i think) already prints the motd on login default["openssh"]["server"]["print_motd"] = "no" |