Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI fixes: yum repos; disable logind; chef 18 #254

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
os:
- centos-stream-8
- ubuntu-2004
- debian-10
- debian-11
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -47,7 +47,7 @@ jobs:
os: ${{ matrix.os }}
env:
CHEF_LICENSE: accept-no-persist
CHEF_VERSION: 16.18.0
CHEF_VERSION: 18.6.14
shellcheck:
runs-on: ubuntu-latest
steps:
Expand Down
11 changes: 5 additions & 6 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ platforms:
intermediate_instructions:
# stub out /etc/fstab for fb_fstab
- RUN touch /etc/fstab
# mirrorlist.centos.org doesn't exist anymore, use baseurl
- RUN sed -i=.bak -e 's/^mirrorlist/#mirrorlist/g' -e 's!^#baseurl=http://mirror.centos.org/$contentdir/$stream!baseurl=https://vault.centos.org/$stream!g' /etc/yum.repos.d/*.repo
- RUN rm /etc/yum.repos.d/*.bak
# enable EPEL (for stuff like hddtemp)
- RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
- name: ubuntu-18.04
Expand All @@ -32,13 +35,9 @@ platforms:
driver:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd
- name: debian-9
- name: debian-11
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd
- name: debian-10
driver:
image: dokken/debian-10
image: dokken/debian-11
pid_one_command: /bin/systemd

provisioner:
Expand Down
45 changes: 45 additions & 0 deletions cookbooks/ci_fixes/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,48 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

node.default['fb_systemd']['logind']['enable'] = false

# older versions of rsyslog try to call close() on every _possible_ fd
# as limited by ulimit -n, which can take MINUTES to start. So drop this
# number for CI: https://github.com/rsyslog/rsyslog/issues/5158
if node.centos_max_version?(9)
node.default['fb_limits']['*']['nofile'] = {
'hard' => '1024',
'soft' => '1024',
}
end

# postfix hasn't setup it's chroot on rsyslog's first startup and
# thus it fails in containers on firstboot, so override postfix
# telling syslog to look at its socket. Why this is an issue only
# on CentOS, I do not know
whyrun_safe_ruby_block 'ci fix for postfix/syslog' do
only_if { node.centos? }
block do
node.default['fb_syslog']['rsyslog_additional_sockets'] = []
end
end

# create the certs the default apache looks at
execute 'create certs' do
only_if { node.centos? }
command 'openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 ' +
'-nodes -out /etc/pki/tls/certs/localhost.crt ' +
'-keyout /etc/pki/tls/private/localhost.key ' +
'-subj "/C=US/ST=California/L=Some City/O=Some Org/CN=test"'
end

# GH Runner's forced apparmor doesn't let binaries write to
# /run/systemd/notify, so tell the unit not to try
# why this seems to be issue on CentOS, I do not know
fb_systemd_override 'syslog-no-systemd' do
only_if { node.centos? }
unit_name 'rsyslog.service'
content({
'Service' => {
'Type' => 'simple',
},
})
end
4 changes: 2 additions & 2 deletions cookbooks/fb_syslog/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
action :start
subscribes :restart, 'package[rsyslog]'
# within vagrant, sometimes rsyslog fails to restart the first time
retries 5
retry_delay 5
retries 1
retry_delay 15
end
Loading