Allow for Jenkins EL9 node

theforeman · Sep 9, 2023 · c2e06da · c2e06da
1 parent 23157ca
commit c2e06da
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -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"

diff --git a/puppet/modules/slave/manifests/packaging/rpm.pp b/puppet/modules/slave/manifests/packaging/rpm.pp
@@ -8,12 +8,13 @@
 ) {
   # 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 {
+  unless $is_el8 or $is_el9 {
     package { ['git-annex', 'pyliblzma']:
       ensure => installed,
     }
@@ -71,7 +72,7 @@
     source => 'puppet:///modules/slave/katello-ca.cert',
   }
 
-  unless $is_el8 {
+  unless $is_el8 or $is_el9 {
     # tito
     # Work around to fix https://github.com/rpm-software-management/tito/pull/354#issuecomment-613523823
     # Pulled from the infra repository

diff --git a/puppet/modules/slave/manifests/unittests.pp b/puppet/modules/slave/manifests/unittests.pp
@@ -3,6 +3,19 @@
   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 {
+    if $facts['os']['name'] == 'CentOS' {
+      yumrepo { 'crb':
+        enabled => '1',
+      }
+    } else if $facts['os']['name'] == 'RedHat' {
+      yumrepo { 'rhel-9-codeready-builder':
+        enabled => '1',
+      }
+    }
+  }
 
   # Build dependencies
   $libxml2_dev = $facts['os']['family'] ? {
@@ -53,12 +66,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', 'transifex-client'])
   }
 
   # 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,