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.

Sign up for GitHub

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

Jump to bottom

Fix CI again #909

Merged
merged 10 commits into from
Feb 16, 2024
Merged

Fix CI again #909

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5021b2f
Pin rspec to < 3.13.0 to ensure it works with chefspec
Feb 15, 2024
112c9f3
Pin rspec-expectations to 3.12.3
Feb 15, 2024
3cbebf5
Fix spec on Ruby 2.4.3
Feb 15, 2024
edfa31e
maybe now?
Feb 15, 2024
b7191e0
Fix error on Ruby 3.0.x
Feb 15, 2024
8d0d64c
Fix error caused by new https://omnitruck.chef.io/install.sh
Feb 15, 2024
3c4c675
Re-add mistakenly removed kitchen configs
Feb 15, 2024
e938d47
Only set up security agent on supported releases
Feb 16, 2024
15fff5c
Only include the security-agent recipe when supported and configured
Feb 16, 2024
40eb8a4
Remove useless variable
Feb 16, 2024
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
5 changes: 5 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ source 'https://rubygems.org'
chef_version = ENV.fetch('CHEF_VERSION', '14.10.9')

gem 'rake'
gem 'rspec-expectations', '< 3.12.4'
gem 'chef', "= #{chef_version}"
gem 'cucumber-core', '~> 3.2.1'
gem 'yaml'
Expand All @@ -19,6 +20,10 @@ gem 'rbnacl', '~> 4.0.2'
gem 'rbnacl-libsodium', '~> 1.0.16'
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'

if RUBY_VERSION >= '3.0.0' && RUBY_VERSION < '3.1.0'
gem 'uri', '= 0.10.1'
end

if RUBY_VERSION < '2.4'
gem 'json', '~> 2.4.1'
end
Expand Down
31 changes: 4 additions & 27 deletions kitchen.docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,16 @@ platforms:
# and http://support.ntp.org/bin/view/Support/KnownOsIssues#Section_9.2.4.2.5.3.
# - name: ubuntu-12.04

- name: ubuntu-14.04
driver_config:
require_chef_omnibus: 14.12
- name: centos-6.6
driver_config:
require_chef_omnibus: 14.12
image: 'datadog/docker-library:chef_kitchen_systemd_centos_6'
run_command: /root/start.sh
attributes:
datadog:
service_provider: Systemd
- name: centos-7.7
driver_config:
require_chef_omnibus: 14.12
image: 'datadog/docker-library:chef_kitchen_systemd_centos_7'
run_command: /root/start.sh
- name: centos-7.7
driver_config:
require_chef_omnibus: 16.5
image: 'datadog/docker-library:chef_kitchen_systemd_centos_7'
run_command: /root/start.sh
- name: debian-8.11
driver_config:
require_chef_omnibus: 14.12
# The Debian 8 (Jessie) GPG key expired on Sat Nov 19 2022 21:01:13 GMT+0000.
# This Docker image uses gpgv wrapper that ignores key expiration date but checks package signatures.
image: 'datadog/docker-library:chef_kitchen_apt_debian_8'
bkabrda marked this conversation as resolved.
Show resolved Hide resolved
- name: rocky-8
driver_config:
platform: rhel # kitchen-docker doesn't recognize rocky otherwise
require_chef_omnibus: 16.17.4
image: 'datadog/docker-library:chef_kitchen_systemd_rocky_8'
run_command: /root/start.sh
# workaround https://github.com/chef/chef/issues/14034 which has been
# fixed, but only for fresh Chef versions (>= 18)
provision_command:
- echo "CentOS Linux release 8" > /etc/redhat-release

suites:
<%
Expand Down
Loading