Move vagrant-ci from CentOS 7 to CentOS 9 Stream

CentOS 9 Stream has new enough PCRE2 required by the no-deps
build. And it's generally a more future-proof option than CentOS
7.

.gitignore

@@ -43,7 +43,7 @@ stamp-h1
 /cf-serverd/Makefile
 /cf-testd/Makefile
 /cf-upgrade/Makefile
-/contrib/vagrant-ci/centos-7-x64/Makefile
+/contrib/vagrant-ci/centos-9s-x64/Makefile
 /examples/Makefile
 /ext/Makefile
 /libcfecompat/Makefile
@@ -154,7 +154,7 @@ cscope.*
 \#*#
 .dir-locals.el
 /contrib/*.elc
-/contrib/vagrant-ci/centos-7-x64/.vagrant
+/contrib/vagrant-ci/centos-9s-x64/.vagrant
 
 ## Flycheck
 flycheck_*

Makefile.am

@@ -50,7 +50,7 @@ SUBDIRS = \
 	ext \
 	examples \
 	tests \
-	contrib/vagrant-ci/centos-7-x64
+	contrib/vagrant-ci/centos-9s-x64
 
 
 # Hide the buildsystem's username, at least with GNU tar.
@@ -158,13 +158,13 @@ cf__v_SED_0 = @echo "  SED     " "$@";
 cf__v_SED_1 =
 
 vm-check:
-	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ vm-check
+	$(MAKE) -C contrib/vagrant-ci/centos-9s-x64/ vm-check
 
 vm-check-full:
-	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ vm-check-full
+	$(MAKE) -C contrib/vagrant-ci/centos-9s-x64/ vm-check-full
 
 destroy-vms:
-	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ destroy-vms
+	$(MAKE) -C contrib/vagrant-ci/centos-9s-x64/ destroy-vms
 
 static-check:
 	tests/static-check/run.sh

configure.ac

@@ -1869,7 +1869,7 @@ AC_CONFIG_FILES([Makefile
     cf-net/Makefile
     cf-secret/Makefile
     config.post.h
-    contrib/vagrant-ci/centos-7-x64/Makefile
+    contrib/vagrant-ci/centos-9s-x64/Makefile
     misc/Makefile
     misc/selinux/Makefile
     python/Makefile

contrib/vagrant-ci/centos-7-x64/Vagrantfile → contrib/vagrant-ci/centos-9s-x64/Vagrantfile

@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder "../../../", "/cfe/core", type: "rsync",
                           rsync__args: ["--archive", "--links", "--delete"]
 
-  config.vm.box = "centos/7"
+  config.vm.box = "generic/centos9s"
   config.vm.provider :libvirt do |lv|
     lv.cpus = os_cpu_cores
     lv.memory = 1024
@@ -30,9 +30,11 @@ Vagrant.configure("2") do |config|
   # common provisioning
   config.vm.provision "shell", inline: <<-SHELL
 sed -ri '/-build/d' /etc/hosts
-yum -q -y install epel-release
-yum -q -y update
-yum -q -y install '@Development tools' pkgconfig pam-devel libtool libtool-ltdl
+dnf -q -y install epel-release
+dnf config-manager --set-enabled crb
+dnf -q -y install '@Development tools' pkgconfig pam-devel libtool libtool-ltdl
+dnf -q -y install 'perl(Sys::Hostname)'  # needed for remake_outputs.pl
+dnf -q -y update
 SHELL
 
   no_deps_vm_name = "no-deps-build"
@@ -44,7 +46,7 @@ SHELL
 
     nd.vm.provision "shell", inline: <<-SHELL
 set -e
-yum -q -y install lmdb-devel pcre2-devel openssl-devel libyaml-devel libxml2-devel
+dnf -q -y install lmdb-devel pcre2-devel openssl-devel libyaml-devel libxml2-devel
 SHELL
 
     nd.vm.provision "shell", inline: <<-SHELL
@@ -73,10 +75,10 @@ SHELL
 
     fd.vm.provision "shell", inline: <<-SHELL
 set -e
-yum -q -y install http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-1.noarch.rpm || true
-yum -q -y install 'perl(ExtUtils::MakeMaker)' 'perl(Digest::MD5)' 'perl(Module::Load::Conditional)' 'perl(IO::Uncompress::Gunzip)' 'perl(JSON::PP)' 'perl(IPC::Cmd)' ncurses-devel rpm-build
-yum -q -y install psmisc # for fuser command
-yum -q -y install wget
+dnf -q -y install 'perl(ExtUtils::MakeMaker)' 'perl(Digest::MD5)' 'perl(Module::Load::Conditional)' 'perl(IO::Uncompress::Gunzip)' 'perl(JSON::PP)' 'perl(IPC::Cmd)' \
+                  ncurses-devel rpm-build
+dnf -q -y install psmisc # for fuser command
+dnf -q -y install wget
 SHELL
 
     fd.vm.provision "shell", inline: <<-SHELL