Skip to content

Commit

Permalink
chore: add support ubuntu 24.04 (#5)
Browse files Browse the repository at this point in the history
* chore: add support ubuntu 24.04

* chore: correct chef version

* chore: correct chef and platform version
  • Loading branch information
igolman authored Aug 19, 2024
1 parent 59aded5 commit e97ac95
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 150 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,15 @@ jobs:
strategy:
matrix:
os:
# - ubuntu-1404
- ubuntu-1604
- ubuntu-1804
- ubuntu-2004
- ubuntu-2204
- ubuntu-2404
suite:
# - default-chef13
- default-chef14
- default-chef15
- default-chef16
- default-chef17
- default-chef18
- custom-chef13
- custom-chef14
- custom-chef15
- custom-chef16
- custom-chef17
- custom-chef18
- disabled-chef13
- disabled-chef14
- disabled-chef15
- disabled-chef16
- disabled-chef17
- disabled-chef18
# include:
Expand Down
148 changes: 14 additions & 134 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ driver:
pull_chef_image: false
pull_platform_image: false
clean_dokken_sandbox: false
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update --fix-missing
use_cache: true
Expand All @@ -27,35 +28,26 @@ verifier:
name: inspec

platforms:
- name: ubuntu-14.04
driver:
image: dokken/ubuntu-14.04
pid_one_command: /sbin/init
cap_add:
- SYS_ADMIN
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd
- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd
- name: ubuntu-22.04
driver:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd
- name: ubuntu-24.04
driver:
image: dokken/ubuntu-24.04

chef18: &chef18 '18.3.0'
chef17: &chef17 '17'
chef18: &chef18 '18'

suites:
- name: default-chef13
- name: default-chef17
driver:
chef_version: '13'
chef_version: *chef17
verifier: &default_verifier
inspec_tests:
- test/integration/default/inspec
Expand All @@ -65,38 +57,6 @@ suites:
run_list: &default_runlist
- recipe[ntpdate]

- name: default-chef14
driver:
chef_version: '14'
verifier:
<<: *default_verifier
run_list:
- *default_runlist

- name: default-chef15
driver:
chef_version: '15'
verifier:
<<: *default_verifier
run_list:
- *default_runlist

- name: default-chef16
driver:
chef_version: '16'
verifier:
<<: *default_verifier
run_list:
- *default_runlist

- name: default-chef17
driver:
chef_version: '17.1.35'
verifier:
<<: *default_verifier
run_list:
- *default_runlist

- name: default-chef18
driver:
chef_version: *chef18
Expand All @@ -105,9 +65,9 @@ suites:
run_list:
- *default_runlist

- name: custom-chef13
- name: custom-chef17
driver:
chef_version: '13'
chef_version: *chef17
verifier: &custom_verifier
inspec_tests:
- test/integration/custom/inspec
Expand All @@ -130,59 +90,19 @@ suites:
hour: 6
weekday: sun

- name: custom-chef14
driver:
chef_version: '14'
verifier:
<<: *custom_verifier
run_list:
- *default_runlist
attributes:
<<: *custom_attributes

- name: custom-chef15
driver:
chef_version: '15'
verifier:
<<: *custom_verifier
run_list:
- *default_runlist
attributes:
<<: *custom_attributes

- name: custom-chef16
driver:
chef_version: '16'
verifier:
<<: *custom_verifier
run_list:
- *default_runlist
attributes:
<<: *custom_attributes

- name: custom-chef17
driver:
chef_version: '17.1.35'
verifier:
<<: *custom_verifier
run_list:
- recipe[ntpdate]
attributes:
<<: *custom_attributes

- name: custom-chef18
driver:
chef_version: *chef18
verifier:
<<: *custom_verifier
run_list:
- recipe[ntpdate]
- *default_runlist
attributes:
<<: *custom_attributes

- name: disabled-chef13
- name: disabled-chef17
driver:
chef_version: '13'
chef_version: *chef17
verifier: &disabled_verifier
inspec_tests:
- test/integration/disabled/inspec
Expand All @@ -205,52 +125,12 @@ suites:
hour: 6
day: 7

- name: disabled-chef14
driver:
chef_version: '14'
verifier:
<<: *disabled_verifier
run_list:
- *default_runlist
attributes:
<<: *disabled_attributes

- name: disabled-chef15
driver:
chef_version: '15'
verifier:
<<: *disabled_verifier
run_list:
- *default_runlist
attributes:
<<: *disabled_attributes

- name: disabled-chef16
driver:
chef_version: '16'
verifier:
<<: *disabled_verifier
run_list:
- *default_runlist
attributes:
<<: *disabled_attributes

- name: disabled-chef17
driver:
chef_version: '17.1.35'
verifier:
<<: *disabled_verifier
run_list:
- recipe[ntpdate]
attributes:
<<: *disabled_attributes

- name: disabled-chef18
driver:
chef_version: *chef18
verifier:
<<: *disabled_verifier
run_list:
- recipe[ntpdate]
- *default_runlist
attributes:
<<: *disabled_attributes
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
AllCops:
TargetRubyVersion: 2.6
RegexpLiteral:
Style/RegexpLiteral:
EnforcedStyle: percent_r
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
ntpdate CHANGELOG
=================

1.7.0
-----

- added tests for `Ubuntu 24.04`
- removed EOL `chef`/`Ubuntu X.Y` tests.

1.6.0
-----

Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Installs/Configures ntpdate'
version '1.6.0'
version '1.7.0'

issues_url 'https://github.com/igolman/ntpdate/issues'
source_url 'https://github.com/igolman/ntpdate'
Expand Down

0 comments on commit e97ac95

Please sign in to comment.