Skip to content

Commit

Permalink
Allow for Jenkins EL9 node
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed Sep 11, 2023
1 parent 6c389ae commit f4354ef
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 4 deletions.
10 changes: 10 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ Vagrant.configure("2") do |config|
end
end

config.vm.define "jenkins-node-el9" do |override|
override.vm.hostname = "jenkins-node-el9"
override.vm.box = "centos/stream9"

override.vm.provider "libvirt" do |libvirt, provider|
libvirt.memory = "4096"
provider.vm.box_url = CENTOS_9_BOX_URL
end
end

config.vm.define "jenkins-node-debian10" do |override|
override.vm.hostname = "jenkins-node-debian10"
override.vm.box = "debian/buster64"
Expand Down
15 changes: 13 additions & 2 deletions puppet/modules/slave/manifests/packaging/rpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,23 @@
) {
# TODO: Fix on EL8 and get rid of this
$is_el8 = $facts['os']['release']['major'] == '8'
$is_el9 = $facts['os']['release']['major'] == '9'

package { ['koji', 'rpm-build', 'createrepo', 'copr-cli']:
ensure => installed,
}

unless $is_el8 {
if $is_el8 or $is_el9 {
yumrepo { 'git-annex':
name => 'git-annex',
baseurl => 'https://downloads.kitenet.net/git-annex/linux/current/rpms/',
enabled => '1',
gpgcheck => '0',
} ->
package { ['git-annex-standalone']:
ensure => installed,
}
} else {
package { ['git-annex', 'pyliblzma']:
ensure => installed,
}
Expand Down Expand Up @@ -71,7 +82,7 @@
source => 'puppet:///modules/slave/katello-ca.cert',
}

unless $is_el8 {
unless $is_el8 or $is_el9 {
# Tito was used in the past, but no longer. This cleans up the files we used to have.
package { 'tito':
ensure => absent,
Expand Down
20 changes: 18 additions & 2 deletions puppet/modules/slave/manifests/unittests.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
Stdlib::Absolutepath $homedir,
) {
$is_el8 = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8'
$is_el9 = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '9'

if $is_el9 {
case $facts['os']['name'] {
'CentOS': {
yumrepo { 'crb':
enabled => '1',
}
}
'RedHat': {
yumrepo { 'codeready-builder-for-rhel-9-x86_64-rpms':
enabled => '1',
}
}
}
}

# Build dependencies
$libxml2_dev = $facts['os']['family'] ? {
Expand Down Expand Up @@ -53,12 +69,12 @@
ensure_packages([$libxml2_dev, $libxslt1_dev, $libkrb5_dev, $systemd_dev, 'freeipmi', 'ipmitool', $firefox, $libvirt_dev, $libcurl_dev,
$sqlite3_dev, $libyaml_dev])

unless $is_el8 {
unless $is_el8 or $is_el9 {
ensure_packages(['python-virtualenv'])
}

# nodejs/npm for JavaScript tests
if $facts['os']['family'] == 'RedHat' {
if $facts['os']['family'] == 'RedHat' and !$is_el9 {
class { 'nodejs':
repo_url_suffix => '12.x',
nodejs_package_ensure => latest,
Expand Down

0 comments on commit f4354ef

Please sign in to comment.