Skip to content

Commit faa200e

Browse files
committed
Remove CentOS 8 based platforms from testing
Signed-off-by: Dan Webb <[email protected]>
1 parent bcc0ee2 commit faa200e

File tree

7 files changed

+22
-179
lines changed

7 files changed

+22
-179
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ jobs:
2222
strategy:
2323
matrix:
2424
os:
25-
- "almalinux-8"
2625
- "almalinux-9"
27-
- "rockylinux-8"
2826
- "rockylinux-9"
29-
- "oraclelinux-8"
3027
- "oraclelinux-9"
3128
- "centos-stream-9"
29+
- "centos-stream-10"
3230
- "amazonlinux-2023"
33-
- "debian-11"
3431
- "debian-12"
32+
- "debian-13"
3533
- "ubuntu-2204"
3634
- "ubuntu-2404"
3735
suite:
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
trigger: model_decision
3+
description: When completing a task check the following are true
4+
---
5+
6+
- `cookstyle` does not return any syntax or stlye errors
7+
- markdownlint-cli2 "**/*.md" "!vendor" "!.venv" --fix
8+
- yamllint
9+
- `kitchen test` does not return any errors
10+
- run all suites
11+
- do not skip suites
12+
This gives us knowledge that we have not broken areas of the cookbook we are not currently changing (regression)
13+
No matter what we have done, even if you think it is outside our control, kitchen test must pass

FAILING_TESTS.md

Lines changed: 0 additions & 149 deletions
This file was deleted.

kitchen.dokken.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ transport: { name: dokken }
77
provisioner: { name: dokken }
88

99
platforms:
10-
- name: almalinux-8
11-
driver:
12-
image: dokken/almalinux-8
13-
pid_one_command: /usr/lib/systemd/systemd
14-
1510
- name: almalinux-9
1611
driver:
1712
image: dokken/almalinux-9
@@ -57,21 +52,11 @@ platforms:
5752
image: dokken/opensuse-leap-15
5853
pid_one_command: /usr/lib/systemd/systemd
5954

60-
- name: oraclelinux-8
61-
driver:
62-
image: dokken/oraclelinux-8
63-
pid_one_command: /usr/lib/systemd/systemd
64-
6555
- name: oraclelinux-9
6656
driver:
6757
image: dokken/oraclelinux-9
6858
pid_one_command: /usr/lib/systemd/systemd
6959

70-
- name: rockylinux-8
71-
driver:
72-
image: dokken/rockylinux-8
73-
pid_one_command: /usr/lib/systemd/systemd
74-
7560
- name: rockylinux-9
7661
driver:
7762
image: dokken/rockylinux-9
@@ -82,11 +67,6 @@ platforms:
8267
image: dokken/rockylinux-10
8368
pid_one_command: /usr/lib/systemd/systemd
8469

85-
- name: ubuntu-20.04
86-
driver:
87-
image: dokken/ubuntu-20.04
88-
pid_one_command: /bin/systemd
89-
9070
- name: ubuntu-22.04
9171
driver:
9272
image: dokken/ubuntu-22.04

kitchen.global.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@ verifier:
1515
name: inspec
1616

1717
platforms:
18-
- name: almalinux-8
1918
- name: almalinux-9
2019
- name: amazonlinux-2023
2120
- name: centos-stream-9
22-
- name: debian-11
21+
- name: centos-stream-10
2322
- name: debian-12
23+
- name: debian-13
2424
- name: fedora-latest
2525
- name: opensuse-leap-15
2626
- name: oraclelinux-8
2727
- name: oraclelinux-9
2828
- name: rockylinux-8
2929
- name: rockylinux-9
30-
- name: ubuntu-20.04
3130
- name: ubuntu-22.04
3231
- name: ubuntu-24.04

metadata.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
chef_version '>= 18.0'
1010

1111
depends 'yum', '>= 7.2'
12-
depends 'gpg'
1312

1413
gem 'deepsort', '~> 0.5.0'
1514
gem 'inifile', '~> 3.0'

resources/install.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def do_repository_action(repo_action)
140140
baseurl yum_repo_url('https://download.postgresql.org/pub/repos/yum')
141141
enabled new_resource.repo_pgdg
142142
gpgcheck true
143-
repo_gpgcheck false
143+
repo_gpgcheck true
144144
gpgkey 'file:///etc/pki/rpm-gpg/PGDG-RPM-GPG-KEY'
145145
action repo_action
146146
only_if { new_resource.repo_pgdg || new_resource.setup_repo_pgdg }
@@ -152,7 +152,7 @@ def do_repository_action(repo_action)
152152
baseurl yum_common_repo_url
153153
enabled new_resource.repo_pgdg_common
154154
gpgcheck true
155-
repo_gpgcheck false
155+
repo_gpgcheck true
156156
gpgkey 'file:///etc/pki/rpm-gpg/PGDG-RPM-GPG-KEY'
157157
action repo_action
158158
only_if { new_resource.repo_pgdg_common || new_resource.setup_repo_pgdg_common }
@@ -165,6 +165,7 @@ def do_repository_action(repo_action)
165165
make_cache false
166166
enabled new_resource.repo_pgdg_source
167167
gpgcheck true
168+
repo_gpgcheck true
168169
gpgkey 'file:///etc/pki/rpm-gpg/PGDG-RPM-GPG-KEY'
169170
action repo_action
170171
only_if { new_resource.repo_pgdg_source || new_resource.setup_repo_pgdg_source }
@@ -177,6 +178,7 @@ def do_repository_action(repo_action)
177178
make_cache false
178179
enabled new_resource.repo_pgdg_updates_testing
179180
gpgcheck true
181+
repo_gpgcheck true
180182
gpgkey 'file:///etc/pki/rpm-gpg/PGDG-RPM-GPG-KEY'
181183
action repo_action
182184
only_if { new_resource.repo_pgdg_updates_testing || new_resource.setup_repo_pgdg_updates_testing }
@@ -189,6 +191,7 @@ def do_repository_action(repo_action)
189191
make_cache false
190192
enabled new_resource.repo_pgdg_source_updates_testing
191193
gpgcheck true
194+
repo_gpgcheck true
192195
gpgkey 'file:///etc/pki/rpm-gpg/PGDG-RPM-GPG-KEY'
193196
action repo_action
194197
only_if { new_resource.repo_pgdg_source_updates_testing || new_resource.setup_repo_pgdg_source_updates_testing }

0 commit comments

Comments
 (0)