Skip to content

Commit 3d8d339

Browse files
committed
Still need ci_fixes, rename not to conflict with name in upstream
1 parent 5a99d32 commit 3d8d339

File tree

7 files changed

+28
-61
lines changed

7 files changed

+28
-61
lines changed

.kitchen.local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ suites:
9191
- name: local
9292
run_list:
9393
- recipe[boxcutter_ohai]
94-
- recipe[ci_fixes]
94+
- recipe[boxcutter_ci_fixes]
9595
- recipe[boxcutter_init]
File renamed without changes.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name 'boxcutter_ci_fixes'
2+
maintainer 'Boxcutter'
3+
maintainer_email 'noreply@boxcutter.dev'
4+
license 'Apache-2.0'
5+
description 'Misc fixes to make the CI work'
6+
source_url 'https://github.com/boxcutter/boxcutter-chef-cookbooks/'
7+
version '0.0.1'
8+
supports 'centos'
9+
supports 'debian'
10+
supports 'fedora'
11+
supports 'ubuntu'
12+
depends 'fb_helpers'
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#
2+
# Cookbook Name:: boxcutter_ci_fixes
3+
# Recipe:: default
4+
#
5+
6+
# On centos-stream-10 you'll see the following error using the fb_systemd
7+
# cookbook. To allow kitchen tests to run in CI, disable systemd-logind:
8+
#
9+
# STDERR: Failed to restart systemd-logind.service: Unit systemd-logind.service
10+
# is masked.
11+
# ---- End output of ["/usr/bin/systemctl", "--system", "restart",
12+
# "systemd-logind"] ----
13+
# Ran ["/usr/bin/systemctl", "--system", "restart", "systemd-logind"] returned 1
14+
#
15+
node.default['fb_systemd']['logind']['enable'] = false

cookbooks/ci_fixes/attributes/default.rb

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

cookbooks/ci_fixes/metadata.rb

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

cookbooks/ci_fixes/recipes/default.rb

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

0 commit comments

Comments
 (0)