summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-06-26 20:47:47 -0700
committerTim Smith <tsmith@chef.io>2018-06-26 20:47:47 -0700
commitf7ca983251fad418d6a0bbd5ed6f85530a0e8be6 (patch)
tree678b490c55e2e8c9b52302eb8a7096042190bc50
parent4e39c729c5981067c028bd3abcb50b066d760a28 (diff)
downloadchef-f7ca983251fad418d6a0bbd5ed6f85530a0e8be6.tar.gz
Remove sudo/gcc-c++ package installs from kitchen testsappbundler
Sudo was added to dokken images. gcc-c++ was added to appbundle-updater. Also use the kitchen-appbundle-updater from rubygems since it's up to date. No need to pull from the repo for this. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--kitchen-tests/Gemfile2
-rw-r--r--kitchen-tests/kitchen.travis.yml13
2 files changed, 1 insertions, 14 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 3505c5f32e..8881eb4e45 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -4,7 +4,7 @@ gem "rake" # required to build some native extensions
gem "chef", path: ".."
gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major
gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
-gem "kitchen-appbundle-updater", git: "https://github.com/chef/kitchen-appbundle-updater", branch: "master"
+gem "kitchen-appbundle-updater"
gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master"
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 7daf95195f..ec6a099458 100644
--- a/kitchen-tests/kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -34,8 +34,6 @@ platforms:
image: dokken/amazonlinux
pid_one_command: /sbin/init
intermediate_instructions:
- # TODO: inspec 2.0 requires gcc-c++, adding here until it can be added to appbundler-updater
- - RUN yum -y install sudo gcc-c++
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: amazonlinux-2
@@ -43,7 +41,6 @@ platforms:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- - RUN yum -y install sudo gcc-c++
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: debian-8
@@ -52,7 +49,6 @@ platforms:
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install sudo
- name: debian-9
driver:
@@ -60,14 +56,12 @@ platforms:
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install sudo
- name: centos-6
driver:
image: dokken/centos-6
pid_one_command: /sbin/init
intermediate_instructions:
- - RUN yum -y install sudo gcc-c++
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: centos-7
@@ -75,7 +69,6 @@ platforms:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- - RUN yum -y install sudo gcc-c++
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: fedora-latest
@@ -83,7 +76,6 @@ platforms:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- - RUN dnf -y install sudo gcc-c++
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: ubuntu-14.04
@@ -92,7 +84,6 @@ platforms:
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install sudo
- name: ubuntu-16.04
driver:
@@ -100,7 +91,6 @@ platforms:
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install sudo
- name: ubuntu-18.04
driver:
@@ -108,14 +98,11 @@ platforms:
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- - RUN /usr/bin/apt-get -y install sudo
- name: opensuse-leap
driver:
image: dokken/opensuse-leap
pid_one_command: /bin/systemd
- intermediate_instructions:
- - RUN /usr/bin/zypper install -y sudo gcc-c++
suites:
- name: base