Skip to content

Commit

Permalink
CI: Update CentOS7->CentOS9
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Jul 24, 2024
1 parent 0e695a3 commit cba7d89
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
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
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
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

0 comments on commit cba7d89

Please sign in to comment.