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

(chore) [CECO-1905] Fix CI #937

Merged
merged 5 commits into from
Jan 6, 2025
Merged

(chore) [CECO-1905] Fix CI #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6a1ad4
fix style ci check
tbavelier Jan 3, 2025
dad7626
fix specs-base ci check 1
tbavelier Jan 3, 2025
cb22b7c
kitchen-docker-tests fix 1
tbavelier Jan 3, 2025
2685a2b
kitchen-docker-tests fix 2
tbavelier Jan 3, 2025
f77cfc4
kitchen-docker-tests fix 3
tbavelier Jan 3, 2025
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
18 changes: 9 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Set Ruby version
command: |
echo "Using $RUBY_VERSION"
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -sSL https://get.rvm.io | bash -s stable
source /home/circleci/.rvm/scripts/rvm
rvm reload
Expand All @@ -35,7 +35,7 @@ jobs:

style:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2004:2024.08.1
environment:
CHEF_VERSION: '16.5.77'
RUBY_VERSION: '2.6.3'
Expand All @@ -45,9 +45,9 @@ jobs:
name: Set Ruby version
command: |
echo "Using $RUBY_VERSION"
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
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -sSL https://get.rvm.io | bash -s stable
source /home/circleci/.rvm/scripts/rvm
rvm reload
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
Expand All @@ -71,7 +71,7 @@ jobs:

specs-base: &specs
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2004:2024.08.1
environment:
CHEF_VERSION: 'needs-to-be-specified'
RUBY_VERSION: 'needs-to-be-specified'
Expand All @@ -81,9 +81,9 @@ jobs:
name: Set Ruby version
command: |
echo "Using $RUBY_VERSION"
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
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -sSL https://get.rvm.io | bash -s stable
source /home/circleci/.rvm/scripts/rvm
rvm reload
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
Expand Down
4 changes: 4 additions & 0 deletions test/integration/dd-agent-gpgcheck-older/serverspec_datadog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if RUBY_VERSION < '2.6'
gem 'public_suffix', '~> 4.0.0'
end

if RUBY_VERSION < '3.0.0'
gem 'rspec-its', '= 1.3.1'
end

gem 'json_spec', '~> 1.1.0'

if Gem::Version.new(chef_version) > Gem::Version.new('16.0.0') && RUBY_VERSION < '2.7'
Expand Down
4 changes: 4 additions & 0 deletions test/integration/dd-agent-gpgcheck-recent/serverspec_datadog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if RUBY_VERSION < '2.6'
gem 'public_suffix', '~> 4.0.0'
end

if RUBY_VERSION < '3.0.0'
gem 'rspec-its', '= 1.3.1'
end

gem 'json_spec', '~> 1.1.0'

if Gem::Version.new(chef_version) > Gem::Version.new('16.0.0') && RUBY_VERSION < '2.7'
Expand Down
4 changes: 4 additions & 0 deletions test/integration/dd-agent-handler5/serverspec_datadog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if RUBY_VERSION < '2.6'
gem 'public_suffix', '~> 4.0.0'
end

if RUBY_VERSION < '3.0.0'
gem 'rspec-its', '= 1.3.1'
end

gem 'json_spec', '~> 1.1.0'

if Gem::Version.new(chef_version) > Gem::Version.new('16.0.0') && RUBY_VERSION < '2.7'
Expand Down
4 changes: 4 additions & 0 deletions test/integration/dd-agent-handler6/serverspec_datadog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if RUBY_VERSION < '2.6'
gem 'public_suffix', '~> 4.0.0'
end

if RUBY_VERSION < '3.0.0'
gem 'rspec-its', '= 1.3.1'
end

gem 'json_spec', '~> 1.1.0'

if Gem::Version.new(chef_version) > Gem::Version.new('16.0.0') && RUBY_VERSION < '2.7'
Expand Down
4 changes: 4 additions & 0 deletions test/integration/dd-agent-handler7/serverspec_datadog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ if RUBY_VERSION < '2.6'
gem 'public_suffix', '~> 4.0.0'
end

if RUBY_VERSION < '3.0.0'
gem 'rspec-its', '= 1.3.1'
end

gem 'json_spec', '~> 1.1.0'

if Gem::Version.new(chef_version) > Gem::Version.new('16.0.0') && RUBY_VERSION < '2.7'
Expand Down
Loading