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

Update CircleCI image to latest Ubuntu 20.04 #846

Merged
merged 6 commits into from
May 6, 2022
Merged

Update CircleCI image to latest Ubuntu 20.04 #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73d7f2d
Update CircleCI image
May 5, 2022
06a798b
Try debugging the script to find out what fails
May 5, 2022
b798284
Run rvm reload
May 5, 2022
3f66bc2
Debug kitchen failures
May 5, 2022
5183d89
Properly debug kitchen
May 5, 2022
80b575e
Fix Agent 5 integration tests on newer kernels
May 6, 2022
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
12 changes: 9 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
version: 2
jobs:
kitchen-docker-tests:
machine: true
machine:
image: ubuntu-2004:202201-02
environment:
CHEF_LICENSE: accept # newer versions of Chef client need explicit license accept to run
KITCHEN_LOCAL_YAML: kitchen.docker.yml
Expand All @@ -15,6 +16,7 @@ jobs:
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm reload
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand All @@ -29,7 +31,8 @@ jobs:
no_output_timeout: 900

style:
machine: true
machine:
image: ubuntu-2004:202201-02
environment:
CHEF_VERSION: '16.5.77'
RUBY_VERSION: '2.6.3'
Expand All @@ -42,6 +45,7 @@ jobs:
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm reload
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand All @@ -63,7 +67,8 @@ jobs:
command: bundle exec rake style

specs-base: &specs
machine: true
machine:
image: ubuntu-2004:202201-02
environment:
CHEF_VERSION: 'needs-to-be-specified'
RUBY_VERSION: 'needs-to-be-specified'
Expand All @@ -76,6 +81,7 @@ jobs:
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm reload
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand Down
4 changes: 3 additions & 1 deletion test/integration/dd-agent-handler5/serverspec/dd-agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
it { should be_running }
end

describe command('/etc/init.d/datadog-agent info | grep -v "API Key is invalid"'), :if => os[:family] != 'windows' do
# On Linux kernel >= 5.5, Agent 5 disk check fails because of old psutil version, which doesn't have fix
# https://github.com/giampaolo/psutil/commit/2e0952e939d6ab517449314876d8d3488ba5b98b
describe command('/etc/init.d/datadog-agent info | grep -v "API Key is invalid" | grep -v "not sure how to interpret line"'), :if => os[:family] != 'windows' do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain 'OK' }
its(:stdout) { should_not contain 'ERROR' }
Expand Down