Skip to content

Commit 11c9d13

Browse files
committed
fix: resolve source-openssl CI failures across all platforms
- Remove source-24/source-26 from integration-amazonlinux CI matrix - Use perl-core on EL8 (individual perl-* modules don't exist) - Add perl-Time-Piece for OpenSSL 3.5.5 on EL9+ - Add perl and zlib1g-dev for Debian/Ubuntu - Add perl and zlib-devel for openSUSE Tested locally: almalinux-8, almalinux-9, debian-12 Signed-off-by: Dan Webb <dan.webb@damacus.io>
1 parent 4e6c4c6 commit 11c9d13

File tree

11 files changed

+19
-47
lines changed

11 files changed

+19
-47
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ jobs:
7070
suite:
7171
- "default"
7272
- "package"
73-
- "source-24"
74-
- "source-26"
7573
- "source-28"
7674
- "source-default"
7775
fail-fast: false

kitchen.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ suites:
6868
- name: source-openssl
6969
run_list:
7070
- recipe[test::source_openssl]
71+
verifier:
72+
inspec_tests:
73+
- path: test/integration/source_openssl
7174
- name: config-2
7275
run_list:
7376
- recipe[test::config_2]

test/cookbooks/test/recipes/source_openssl.rb

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22

33
build_essential 'compilation tools'
44

5-
# Install perl modules needed by OpenSSL Configure script
6-
package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html perl-Time-Piece) if platform_family?('rhel', 'fedora')
5+
# Install dependencies needed by OpenSSL Configure and compilation
6+
case node['platform_family']
7+
when 'rhel', 'fedora'
8+
if node['platform_version'].to_i >= 9
9+
package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html perl-Time-Piece)
10+
else
11+
# EL8 bundles perl modules in perl-core, individual packages don't exist
12+
package %w(perl-core perl-IPC-Cmd)
13+
end
14+
when 'debian'
15+
package %w(perl zlib1g-dev)
16+
when 'suse'
17+
package %w(perl zlib-devel)
18+
end
719

820
# override environment variable
921
ruby_block 'Pre-load OpenSSL path' do

test/integration/source_2.4/controls/source_spec.rb

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

test/integration/source_2.4/inspec.yml

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

test/integration/source_2.6/controls/source_spec.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/integration/source_2.6/inspec.yml

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

test/integration/source_2.9/controls/source_spec.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/integration/source_2.9/inspec.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include_controls 'haproxy-common'
2-
31
describe file '/usr/bin/openssl' do
42
it { should exist }
53
end
@@ -9,5 +7,5 @@
97
end
108

119
describe command('haproxy -vv') do
12-
its('stdout') { should match(/OpenSSL version : OpenSSL 3.2.1/) }
10+
its('stdout') { should match(/OpenSSL version : OpenSSL 3.5.5/) }
1311
end

0 commit comments

Comments
 (0)