diff options
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/default.rb | 1 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 12 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb index 0cd7cc2e00..00d47fa9f8 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb @@ -48,7 +48,6 @@ users_manage "sysadmin" do end ssh_known_hosts_entry "github.com" -ssh_known_hosts_entry "travis.org" sudo "sysadmins" do group ["sysadmin", "%superadmin"] diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index c737639405..c34d7d209c 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -74,8 +74,14 @@ platforms: image: dokken/centos-6 pid_one_command: /sbin/init intermediate_instructions: - - RUN yum install -y libffi-devel - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + lifecycle: + post_create: + - remote: echo "BTTTTTMMMM BTM BTM BTM" + - remote: yum install -y libffi-devel + - remote: export LIBFFI_CFLAGS=-I /usr/lib64/libffi-3.0.5/include + - remote: export LIBFFI_LIBS="-L /usr/lib64 -lffi" + - remote: ls -l /usr/lib64/libffi-3.0.5/include/ffi.h - name: centos-7 driver: @@ -98,8 +104,10 @@ platforms: image: dokken/oraclelinux-6 pid_one_command: /sbin/init intermediate_instructions: - - RUN yum install -y libffi-devel - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + lifecycle: + post_create: + - remote: yum install -y libffi-devel - name: oraclelinux-7 driver: diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index e74f598d40..d0c331cc38 100755 --- a/scripts/bk_tests/bk_linux_exec.sh +++ b/scripts/bk_tests/bk_linux_exec.sh @@ -39,10 +39,11 @@ echo "--- Installing Ruby 2.6.5" /opt/asdf/bin/asdf install ruby 2.6.5 /opt/asdf/bin/asdf global ruby 2.6.5 +echo "--- Updating Gems" # Update Gems gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) --force --no-document sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) ruby --version which bundle -bundle install --jobs=3 --retry=3 --path=vendor/bundle
\ No newline at end of file +bundle install --jobs=3 --retry=3 --path=vendor/bundle |