Support CentOS 8 and 9 for release-testing

Supporting RHEL directly is a pain due to subscription requirements, and Fedora doesn't seem to have AMIs available anymore

Author: rocallahan

release-process/distro-configs/centos8.json

@@ -0,0 +1,16 @@
+{
+  "name": "CentOS Stream 8",
+  "ami_owner": "125523088429",
+  "ami_name_pattern": "CentOS Stream 8 *",
+  "user": "centos",
+  "staticlibs": false,
+  "setup_commands": [
+    "cloud-init status --wait",
+    "sudo dnf config-manager --set-enabled powertools",
+    "sudo dnf install -y epel-release epel-next-release",
+    "sudo dnf update -y"
+  ],
+  "install_build_deps": "sudo dnf install -y rpm ccache cmake gcc gcc-c++ gdb glibc-devel glibc-devel.i686 libstdc++-devel libstdc++-devel.i686 libstdc++-static libstdc++-static.i686 zlib-devel git python3 python3-pexpect rpm-build ninja-build capnproto capnproto-libs capnproto-devel",
+  "install_test_deps": "sudo dnf install -y gtk3 dbus-glib xorg-x11-utils gnutls-devel libacl-devel openldap-devel tigervnc-server-minimal curl tar bzip2 libreoffice-writer",
+  "exclude_tests": ["x86/pkeys.*"]
+}

release-process/distro-configs/centos9.json

@@ -0,0 +1,15 @@
+{
+  "name": "CentOS Stream 9",
+  "ami_owner": "125523088429",
+  "ami_name_pattern": "CentOS Stream 9 *",
+  "user": "ec2-user",
+  "staticlibs": false,
+  "setup_commands": [
+    "cloud-init status --wait",
+    "sudo dnf config-manager --set-enabled crb",
+    "sudo dnf install -y epel-release epel-next-release",
+    "sudo dnf update -y"
+  ],
+  "install_build_deps": "sudo dnf install -y rpm ccache cmake gcc gcc-c++ gdb glibc-devel glibc-devel.i686 libstdc++-devel libstdc++-devel.i686 libstdc++-static libstdc++-static.i686 zlib-devel git python3 python3-pexpect rpm-build ninja-build capnproto capnproto-libs capnproto-devel",
+  "install_test_deps": "sudo dnf install -y gtk3 dbus-glib xorg-x11-utils gnutls-devel libacl-devel openldap-devel tigervnc-server-minimal curl tar bzip2 libreoffice-writer"
+}

release-process/rr-testing.sh

@@ -2,6 +2,7 @@
 #
 # Requires variables and functions to be set. See test-system.py.
 # $git_revision : git revision to check out, build and test
+# $staticlibs : TRUE or FALSE to build with static libs
 # $build_dist : 1 if we should build dist packages, 0 otherwise
 # $test_firefox : 1 to run firefox tests, 0 to skip
 # $ctest_options : options to pass to ctest, e.g to exclude certain tests
@@ -29,7 +30,7 @@ git checkout $git_revision
 rm -rf ~/obj || true
 mkdir ~/obj
 cd ~/obj
-cmake -G Ninja -DCMAKE_BUILD_TYPE=RELEASE -Dstaticlibs=TRUE -Dstrip=TRUE ../rr
+cmake -G Ninja -DCMAKE_BUILD_TYPE=RELEASE -Dstaticlibs=$staticlibs -Dstrip=TRUE ../rr
 ninja
 
 # Test deps are installed in parallel with our build.

release-process/test-system.py

@@ -76,14 +76,15 @@ def wait_for_ssh(self):
         self.instance.wait_until_running()
         self.instance.reload()
         print('Started VM %s "%s" at %s'%(self.instance.id, self.distro_name, self.instance.public_ip_address), file=sys.stderr)
-        for retries in range(30):
+        for retries in range(60):
             result = subprocess.run(self.ssh_command() + ['true'], stdin=subprocess.DEVNULL, stderr=subprocess.PIPE)
             if result.returncode == 0:
                 self.ssh_ready = True
-                break
-            if b'Connection refused' not in result.stderr:
+                return
+            if b'Connection refused' not in result.stderr and b'reset by peer' not in result.stderr:
                 raise Exception('SSH connection failed:\n%s'%result.stderr.decode('utf-8'))
             time.sleep(1)
+        raise Exception('Too many retries, cannot connect via SSH')
 
     def ssh(self, cmd, input):
         """Run `cmd` (command + args list) via SSH and wait for it to finish.
@@ -137,6 +138,10 @@ def config_script_function(config_key):
         raise ValueError('Invalid config entry %s: %s' % (config_key, entry))
     return ('function %s {\n%s\n}' % (config_key, '\n'.join(lines)))
 
+if args.dist_files_dir and not distro_config.get('staticlibs', True):
+    print('Dist builds must use staticlibs, aborting', file=sys.stderr)
+    sys.exit(1)
+
 vm = Ec2Vm(args.machine_type, args.architecture, distro_config, args.keypair_pem_file)
 success = False
 try:
@@ -148,6 +153,7 @@ def config_script_function(config_key):
             config_script_function('install_build_deps'),
             config_script_function('install_test_deps'),
             'git_revision=%s'%args.git_revision,
+            'staticlibs=%s'%('TRUE' if distro_config.get('staticlibs', True) else 'FALSE'),
             'build_dist=%d'%(1 if args.dist_files_dir is not None else 0),
             'test_firefox=%d'%(1 if args.architecture == 'x86_64' else 0),
             'ctest_options="%s"'%' '.join('-E %s'%r for r in exclude_tests),

src/test/invalid_interpreter.c

@@ -23,6 +23,8 @@ void callback(__attribute__((unused)) uint64_t env, char* name, map_properties_t
 
 int main(void) {
   page_size = sysconf(_SC_PAGESIZE);
+  /* Trigger dl_runtime_resolve etc for mmap */
+  mmap(NULL, page_size, PROT_NONE, MAP_ANONYMOUS, -1, 0);
   FILE* maps_file = fopen("/proc/self/maps", "r");
   iterate_maps(0, callback, maps_file);
   test_assert(n_to_unmap > 0);