Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions pkg/steps/clusterinstall/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,11 @@ objects:
}

function run-upgrade-tests() {
openshift-tests run-resourcewatch --help > /dev/null 2>&1
rwsupported=$?
rwsupported=0
openshift-tests run-resourcewatch --help > /dev/null 2>&1 || rwsupported=$?
if [[ $rwsupported -eq 0 ]]; then
# need to create namespace for lease acquisition
oc --kubeconfig=${KUBECONFIG} create namespace ci-operator-monitor || true
REPOSITORY_PATH=/resourcewatch openshift-tests run-resourcewatch --kubeconfig=${KUBECONFIG} --namespace=ci-operator-monitor &
rw_pid=$!
fi
Expand All @@ -333,7 +335,7 @@ objects:
--provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
if [[ $rwsupported -eq 0 ]]; then
kill $rw_pid || true
tar -cf ${ARTIFACT_DIR}/resourcewatch.tar /resourcewatch
tar -cf ${ARTIFACT_DIR}/resourcewatch.tar /resourcewatch || true
fi
}

Expand Down