Skip to content

Bump Scanner deploy wait timeouts and fix testcase (#2149) - 2.36/4.7 #2160

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

Closed
dcaravel wants to merge 1 commit into from
Closed

Bump Scanner deploy wait timeouts and fix testcase (#2149) - 2.36/4.7 #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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
Loading