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

CI: Update CentOS7->CentOS9 #1891

Merged
merged 2 commits into from
Jul 24, 2024
Merged

CI: Update CentOS7->CentOS9 #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e695a3
EL8/9 Fedora: Install iputils
bastelfreak Jul 23, 2024
cba7d89
CI: Update CentOS7->CentOS9
bastelfreak Jul 23, 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
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ jobs:
run: bundle exec rake rubocop

test:
# CentOS 7 testing is broken on Ubuntu 22.04
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ def hosts_opt(use_preserved_hosts = false)
end

def agent_target
ENV['TEST_TARGET'] || 'centos7-64af'
ENV['TEST_TARGET'] || 'centos9-64af'
end

def master_target
ENV['MASTER_TEST_TARGET'] || 'centos7-64default.mdcal'
ENV['MASTER_TEST_TARGET'] || 'centos9-64default.mdcal'
end

def test_targets
Expand Down
2 changes: 2 additions & 0 deletions acceptance/tests/base/host/packages.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ def get_host_pkg(host)
Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
when /solaris-10/
Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
when /el-[89]/
Beaker::HostPrebuiltSteps::RHEL8_PACKAGES
else
Beaker::HostPrebuiltSteps::UNIX_PACKAGES
end
Expand Down
4 changes: 2 additions & 2 deletions lib/beaker/host_prebuilt_steps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module HostPrebuiltSteps
SLEEPWAIT = 5
TRIES = 5
AMAZON2023_PACKAGES = %w[chrony]
RHEL8_PACKAGES = %w[chrony]
FEDORA_PACKAGES = %w[chrony]
RHEL8_PACKAGES = %w[chrony iputils] # iputils provides ping. beaker assumes that's present
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL: there's a ping method in beaker. I suspect we'd need to add that to Fedora and Amazon too.

This reminds me I should finish #1853 one day.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware of it either :D

FEDORA_PACKAGES = %w[chrony iputils]
UNIX_PACKAGES = %w[curl ntpdate]
FREEBSD_PACKAGES = ['curl', 'perl5|perl']
OPENBSD_PACKAGES = ['curl']
Expand Down