Skip to content

Commit c019f02

Browse files
authored
Improve chef14 support (#30)
* Fix issue with chef 14 * Add chef 14 and ubuntu 18.04 to tests
1 parent 2368336 commit c019f02

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.kitchen.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ platforms:
3636
box: ubuntu/artful64
3737
provisioner:
3838
require_chef_omnibus: 13.6.4
39+
40+
- name: ubuntu1804
41+
driver_config:
42+
box: ubuntu/bionic64
43+
provisioner:
44+
require_chef_omnibus: 14.3.37
3945

4046
- name: centos7
4147
driver_config:
@@ -97,6 +103,7 @@ suites:
97103
- debian9
98104
- ubuntu1604
99105
- ubuntu1710
106+
- ubuntu1804
100107
- centos7
101108

102109
attributes:

libraries/helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module Helpers
77
require 'json'
88
require 'fileutils'
99

10-
def archive_name(version)
10+
def get_archive_name(version)
1111
name = 'vsts_agent'
1212
name += '_' + version if version
1313
name

resources/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
converge_if_changed do
5959
archive_url = download_url(version)
60-
archive_name = archive_name(version)
60+
archive_name = get_archive_name(version)
6161
unpack_dir = ::File.join(Chef::Config[:file_cache_path], 'unpack_agent')
6262
unpack_dir = win_friendly_path(unpack_dir) if windows?
6363

0 commit comments

Comments
 (0)