Update CircleCI image to latest Ubuntu 20.04
MODIFY
.circleci/config.yml
.circleci/config.yml
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
@@ -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:
@@ -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'
@@ -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:
@@ -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'
@@ -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:

MODIFY
test/integration/dd-agent-handler5/serverspec/dd-agent_spec.rb
test/integration/dd-agent-handler5/serverspec/dd-agent_spec.rb
@@ -8,7 +8,9 @@ describe service(@agent_service_name) do
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' }

Update CircleCI image to latest Ubuntu 20.04 (#846)