Skip to content

Commit 0b6738a

Browse files
committed
fix(test): add apt_update to source compilation test recipes
Source compilation recipes need apt_update on Debian/Ubuntu to ensure fresh apt cache in Dokken containers. Signed-off-by: Dan Webb <dan.webb@damacus.io>
1 parent d73e22f commit 0b6738a

File tree

9 files changed

+10
-59
lines changed

9 files changed

+10
-59
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,9 @@ jobs:
4141
suite:
4242
- "default"
4343
- "package"
44-
- "source-24"
45-
- "source-26"
4644
- "source-28"
4745
- "source-default"
48-
# - "source-openssl"
49-
# OpenSSL libraries are not currently compiling correctly
50-
# see https://github.com/sous-chefs/haproxy/issues/503
46+
- "source-openssl"
5147
fail-fast: false
5248

5349
steps:

kitchen.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ suites:
5656
- name: package
5757
run_list: *package_run_list
5858
verifier: *package_verifier
59-
- name: source-2.4
60-
run_list:
61-
- recipe[test::source_24]
62-
- name: source-2.6
63-
run_list:
64-
- recipe[test::source_26]
6559
- name: source-2.8
6660
run_list:
6761
- recipe[test::source_28]

spec/unit/resources/install_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@
4848
end
4949

5050
context 'compile HAProxy on AlmaLinux >= 10 (uses PCRE2)' do
51-
platform 'almalinux', '9'
51+
platform 'almalinux', '10'
5252

5353
recipe do
54-
node.automatic['platform_version'] = '10.0'
5554
haproxy_install 'source'
5655
end
5756
before(:each) do

test/cookbooks/test/recipes/source_24.rb

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

test/cookbooks/test/recipes/source_26.rb

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

test/cookbooks/test/recipes/source_28.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apt_update 'update' if platform_family?('debian')
2+
13
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
24
version = '3.2.14'
35

test/cookbooks/test/recipes/source_lua.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apt_update 'update' if platform_family?('debian')
2+
13
build_essential 'compilation tools'
24

35
# install lua dependencies

test/cookbooks/test/recipes/source_openssl.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apt_update 'update' if platform_family?('debian')
2+
13
build_essential 'compilation tools'
24

35
# package %w(build-essential zlib1g-dev) if platform_family?('debian')

test/cookbooks/test/recipes/source_28_pcre2.rb renamed to test/cookbooks/test/recipes/source_pcre2.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apt_update 'update' if platform_family?('debian')
2+
13
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
24
version = '3.2.14'
35

0 commit comments

Comments
 (0)