From 12586c40cbdaf011a4d3f993741a9fac7adbf313 Mon Sep 17 00:00:00 2001 From: Bram Gillemon Date: Mon, 12 Feb 2024 00:06:06 +0100 Subject: [PATCH] fix centos and debian --- .github/workflows/ci.yml | 2 +- test/integration/default/default_spec.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a315b94..68c4954c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: strategy: matrix: os: - - "amazonlinux-2" - "centos-7" - "centos-stream-8" - "centos-stream-9" @@ -34,6 +33,7 @@ jobs: - "oraclelinux-8" - "ubuntu-1804" - "ubuntu-2004" + - "ubuntu-2204" suite: - "default" fail-fast: false diff --git a/test/integration/default/default_spec.rb b/test/integration/default/default_spec.rb index 6f879b31..4a90b0a9 100644 --- a/test/integration/default/default_spec.rb +++ b/test/integration/default/default_spec.rb @@ -6,7 +6,7 @@ 'ntp' end -if (os.family == 'redhat' && os.release.to_i >= 8) || (inspec.os.name == 'fedora' && os.release.to_i >= 34) +if (os.family == 'redhat') || (inspec.os.name == 'fedora') describe file '/etc/ntp.conf' do it { should_not be_file } end @@ -19,6 +19,10 @@ it { should_not be_enabled } it { should_not be_running } end +elsif os.family == 'debian' + describe file '/usr/share/zoneinfo/leap-seconds.list' do + it { should be_file } + end elsif os.windows? describe file 'C:\NTP\etc\ntp.conf' do it { should be_file }