Backport s390x and CI fixes - 2.35/4.6 (#2161)

Co-authored-by: Brad Lugo <blugo@redhat.com>

Author: dcaravel

.openshift-ci/pre_tests.py

@@ -12,7 +12,7 @@ class Deployer:
     Deployer - Deploys Scanner and ScannerDB resources and port-forwards the necessary endpoints.
     """
 
-    DEPLOY_TIMEOUT = 10 * 60
+    DEPLOY_TIMEOUT = 30 * 60
 
     def __init__(self, slim=False):
         self.slim = slim

e2etests/testcase_test.go

@@ -4028,7 +4028,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
 				Name:          "tomcat",
 				VersionFormat: component.JavaSourceType.String(),
 				Version:       "9.0.59",
-				FixedBy:       "9.0.107",
+				FixedBy:       "9.0.108",
 				Location:      "tomcat-embed-core-9.0.59.jar",
 				Vulnerabilities: []apiV1.Vulnerability{
 					{

image/db/rhel/scripts/download.sh

@@ -15,8 +15,11 @@ output_dir="/rpms"
 mkdir $output_dir
 
 if [[ "$arch" == "s390x" ]]; then
+  # TODO(ROX-30647): Builds are failing due to UBI9:latest not containing the
+  #  necessary version of openssl-libs to build postgresql-contrib.
+  pg_build_version="0:16.8-1.module_el9+1209+bd6e4013.s390x"
   dnf module enable -y postgresql:16
-  dnf install -y --downloadonly --downloaddir=/tmp postgresql postgresql-private-libs postgresql-server postgresql-contrib
+  dnf install -y --downloadonly --downloaddir=/tmp "postgresql-${pg_build_version}" "postgresql-private-libs-${pg_build_version}" "postgresql-server-${pg_build_version}" "postgresql-contrib-${pg_build_version}"
   mv /tmp/postgresql-contrib-*.rpm "${output_dir}/postgres-contrib.rpm"
   mv /tmp/postgresql-server-*.rpm "${output_dir}/postgres-server.rpm"
   mv /tmp/postgresql-private-libs-*.rpm "${output_dir}/postgres-libs.rpm"

scripts/ci/deploy.sh

@@ -32,7 +32,7 @@ _wait_for_scanner() {
     kubectl -n stackrox get pod
     POD="$(kubectl -n stackrox get pod -o jsonpath='{.items[?(@.metadata.labels.app=="scanner")].metadata.name}')"
     [[ -n "${POD}" ]]
-    kubectl -n stackrox wait "--for=condition=Ready" "pod/${POD}" --timeout=10m
+    kubectl -n stackrox wait "--for=condition=Ready" "pod/${POD}" --timeout=30m
     kubectl -n stackrox get pod
 }