Commit ab3fffc6 authored by Tim Smith's avatar Tim Smith
Browse files

Prevent helper collisions in Chef Infra Client 16



which is a built-in helper in Chef Infra Client 16 and the helper here
is defining that name again and breaking resources within the client.

Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 3630d19c
...@@ -23,11 +23,13 @@ env: ...@@ -23,11 +23,13 @@ env:
- INSTANCE=default-debian-10 - INSTANCE=default-debian-10
- INSTANCE=default-ubuntu-1604 - INSTANCE=default-ubuntu-1604
- INSTANCE=default-ubuntu-1804 - INSTANCE=default-ubuntu-1804
- INSTANCE=default-ubuntu-2004
- INSTANCE=cacher-debian-9 - INSTANCE=cacher-debian-9
- INSTANCE=cacher-debian-10 - INSTANCE=cacher-debian-10
- INSTANCE=cacher-ubuntu-1604 - INSTANCE=cacher-ubuntu-1604
- INSTANCE=compile-time-ubuntu-1604 - INSTANCE=compile-time-ubuntu-1604
- INSTANCE=compile-time-ubuntu-1804 - INSTANCE=compile-time-ubuntu-1804
- INSTANCE=compile-time-ubuntu-2004
- INSTANCE=compile-time-debian-9 - INSTANCE=compile-time-debian-9
- INSTANCE=compile-time-debian-10 - INSTANCE=compile-time-debian-10
- INSTANCE=unattended-upgrades-ubuntu-1604 - INSTANCE=unattended-upgrades-ubuntu-1604
......
...@@ -49,3 +49,8 @@ platforms: ...@@ -49,3 +49,8 @@ platforms:
driver: driver:
image: dokken/ubuntu-18.04 image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd pid_one_command: /bin/systemd
- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd
...@@ -24,13 +24,13 @@ module Apt ...@@ -24,13 +24,13 @@ module Apt
# #
# @return [Boolean] # @return [Boolean]
def apt_installed? def apt_installed?
!which('apt-get').nil? !apt_which('apt-get').nil?
end end
# Finds a command in $PATH # Finds a command in $PATH
# #
# @return [String, nil] # @return [String, nil]
def which(cmd) def apt_which(cmd)
ENV['PATH'] = '' if ENV['PATH'].nil? ENV['PATH'] = '' if ENV['PATH'].nil?
paths = (ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin)) paths = (ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin))
......
...@@ -43,7 +43,6 @@ end ...@@ -43,7 +43,6 @@ end
# For other recipes to call to force an update # For other recipes to call to force an update
execute 'apt-get update' do # rubocop: disable ChefModernize/ExecuteAptUpdate execute 'apt-get update' do # rubocop: disable ChefModernize/ExecuteAptUpdate
command 'apt-get update'
ignore_failure true ignore_failure true
action :nothing action :nothing
notifies :touch, 'file[/var/lib/apt/periodic/update-success-stamp]', :immediately notifies :touch, 'file[/var/lib/apt/periodic/update-success-stamp]', :immediately
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment