diff --git a/Vagrantfile b/Vagrantfile index 6732377fe..59a5416c8 100644 --- 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 index f44228c6b..992bac9db 100644 --- 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, } - if $is_el8 { + if $is_el8 or $is_el9 { yumrepo { 'git-annex': name => 'git-annex', baseurl => 'https://downloads.kitenet.net/git-annex/linux/current/rpms/', diff --git a/puppet/modules/slave/manifests/unittests.pp b/puppet/modules/slave/manifests/unittests.pp index 7947107bb..da4df056f 100644 --- a/puppet/modules/slave/manifests/unittests.pp +++ b/puppet/modules/slave/manifests/unittests.pp @@ -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'] ? { @@ -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 { - ensure_packages(['python-virtualenv', 'transifex-client']) + 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,