Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/e2e/RHIDP-2914' into e2e/RHIDP-2914
Browse files Browse the repository at this point in the history
  • Loading branch information
nilgaar committed Feb 18, 2025
2 parents 40eec37 + cf6ca1c commit 3ea7542
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
8 changes: 2 additions & 6 deletions .ibm/pipelines/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ droute_send() {
if [[ "${OPENSHIFT_CI}" != "true" ]]; then return 0; fi
temp_kubeconfig=$(mktemp) # Create temporary KUBECONFIG to open second `oc` session
( # Open subshell
if [ -n "${PULL_NUMBER:-}" ]; then
set +e
fi
set +e
export KUBECONFIG="$temp_kubeconfig"
local droute_version="1.2.2"
local release_name=$1
Expand Down Expand Up @@ -185,9 +183,7 @@ droute_send() {
set -e
fi
oc exec -n "${droute_project}" "${droute_pod_name}" -- /bin/bash -c "rm -rf ${temp_droute}/*"
if [ -n "${PULL_NUMBER:-}" ]; then
set -e
fi
set -e
) # Close subshell
rm -f "$temp_kubeconfig" # Destroy temporary KUBECONFIG
oc whoami --show-server
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/playwright/e2e/operator/update-operator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ kubeTest.describe.serial("OpenShift Operator Tests", () => {
],
namespace,
);
await page.waitForTimeout(30_000);
await page.waitForTimeout(60_000);
await page.goto(operator.rhdhUrl);
await common.loginAsGuest();
await uiHelper.openSidebar("Settings");
Expand All @@ -71,7 +71,7 @@ kubeTest.describe.serial("OpenShift Operator Tests", () => {
],
namespace,
);
await page.waitForTimeout(30_000);
await page.waitForTimeout(60_000);

await page.goto(operator.rhdhUrl);
common.loginAsGuest();
Expand Down

0 comments on commit 3ea7542

Please sign in to comment.