Skip to content

Backport s390x and CI fixes - 2.36/4.7 #2147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcaravel merged 6 commits into from
Sep 10, 2025
Merged

Backport s390x and CI fixes - 2.36/4.7 #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
787d1fa
fix(ci): add specific psql version to fix s390x (#2092)
BradLugo Aug 27, 2025
6e5de33
bump timeout waiting for scanner deploy
dcaravel Sep 9, 2025
b840996
more power
dcaravel Sep 9, 2025
2a97457
update other timeout
dcaravel Sep 9, 2025
093c601
sync timeouts
dcaravel Sep 10, 2025
97f0c59
Bump Scanner deploy wait timeouts and fix testcase (#2149)
dcaravel Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .openshift-ci/pre_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Deployer:
Deployer - Deploys Scanner and ScannerDB resources and port-forwards the necessary endpoints.
"""

DEPLOY_TIMEOUT = 10 * 60
DEPLOY_TIMEOUT = 20 * 60

def __init__(self, slim=False):
self.slim = slim
Expand Down
2 changes: 1 addition & 1 deletion e2etests/testcase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand Down
5 changes: 4 additions & 1 deletion image/db/rhel/scripts/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=20m
kubectl -n stackrox get pod
}

Expand Down