Skip to content

Commit cddd931

Browse files
committed
Minimal changes to make upstream GitHub Actions workflows working
1 parent 58bbbe8 commit cddd931

File tree

6 files changed

+42
-15
lines changed

6 files changed

+42
-15
lines changed

.github/CODEOWNERS

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

.github/workflows/ci.yml renamed to .github/workflows/polymath-ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
ruby: [2.4, 2.5, 2.6]
11+
ruby: [2.4, 2.5]
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout repository
@@ -30,16 +30,12 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
os:
33-
- centos-7
34-
- centos-stream-8
35-
- ubuntu-1804
3633
- ubuntu-2004
37-
- debian-9
38-
- debian-10
34+
- ubuntu-2204
3935
runs-on: ubuntu-latest
4036
steps:
4137
- name: Checkout repository
42-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3
4339
- name: Install Chef
4440
uses: actionshub/chef-install@1.1.0
4541
with:
@@ -52,11 +48,12 @@ jobs:
5248
os: ${{ matrix.os }}
5349
env:
5450
CHEF_LICENSE: accept-no-persist
55-
CHEF_VERSION: 14.15.6
51+
CHEF_VERSION: 17.10.0
52+
KITCHEN_YAML: .kitchen.polymath.yml
5653
shellcheck:
5754
runs-on: ubuntu-latest
5855
steps:
5956
- name: Checkout repository
60-
uses: actions/checkout@v2
57+
uses: actions/checkout@v3
6158
- name: Run Shellcheck
6259
uses: ludeeus/action-shellcheck@0.3.0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Gemfile.lock
55
.kitchen
66
.bundle
77
vendor
8+
.idea/

.kitchen.polymath.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
driver:
2+
name: dokken
3+
privileged: true
4+
# our cookbooks should be compatible with the latest Chef,
5+
# but we nee to ensure they still work on 13 until we move to 14
6+
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
7+
8+
platforms:
9+
- name: ubuntu-20.04
10+
driver:
11+
image: dokken/ubuntu-20.04
12+
pid_one_command: /bin/systemd
13+
- name: ubuntu-22.04
14+
driver:
15+
image: dokken/ubuntu-22.04
16+
pid_one_command: /bin/systemd
17+
18+
provisioner:
19+
name: dokken
20+
chef_log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
21+
22+
transport:
23+
name: dokken
24+
25+
suites:
26+
- name: default
27+
run_list:
28+
- recipe[ci_fixes]
29+
- recipe[fb_init_sample]

cookbooks/fb_init_sample/recipes/default.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
include_recipe 'fb_hostconf'
8080
include_recipe 'fb_sysctl'
8181
# HERE: networking
82-
include_recipe 'fb_users'
82+
# MT 2023-05-18 Requires FB::Users::UID_MAP/GID_MAP to be defined
83+
# include_recipe 'fb_users'
8384
if node.centos?
8485
# We turn this off because the override causes intermittent failures in
8586
# Travis when rsyslog is restarted

cookbooks/fb_systemd/recipes/default.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@
8181
include_recipe 'fb_systemd::journal-remote'
8282
include_recipe 'fb_systemd::journal-upload'
8383
include_recipe 'fb_systemd::logind'
84-
include_recipe 'fb_systemd::networkd'
84+
# MT 2023-05-18 Don't try to manage networking in a container
85+
unless node.container?
86+
include_recipe 'fb_systemd::networkd'
87+
end
8588
include_recipe 'fb_systemd::resolved'
8689
include_recipe 'fb_systemd::timesyncd'
8790
include_recipe 'fb_systemd::boot'

0 commit comments

Comments
 (0)