Skip to content

Commit

Permalink
Merge pull request #1098 from rbaturov/separte-uninstall-e2e-script
Browse files Browse the repository at this point in the history
Separated NROP uninstall from install script
  • Loading branch information
openshift-merge-bot[bot] authored Dec 8, 2024
2 parents 049a46f + b767230 commit ee53bb4
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ test-e2e: build-e2e-all
test-install-e2e: build-e2e-all
hack/run-test-install-e2e.sh

test-uninstall-e2e: build-e2e-all
hack/run-test-uninstall-e2e.sh

test-must-gather-e2e: build-must-gather-e2e
hack/run-test-must-gather-e2e.sh

Expand Down
6 changes: 0 additions & 6 deletions hack/run-test-install-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,3 @@ if ! "${BIN_DIR}"/e2e-nrop-install.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=
echo "Failed to run NRO install test suite"
exit 1
fi

echo "Running NRO uninstall test suite";
if ! "${BIN_DIR}"/e2e-nrop-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/uninstall.xml; then
echo "Failed to run NRO install test suite"
exit 2
fi
18 changes: 18 additions & 0 deletions hack/run-test-uninstall-e2e.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash

source hack/common.sh

NO_COLOR=""
if ! which tput &> /dev/null 2>&1 || [[ $(tput -T$TERM colors) -lt 8 ]]; then
echo "Terminal does not seem to support colored output, disabling it"
NO_COLOR="-ginkgo.no-color"
fi

setupreport

# Run uninstall test suite
echo "Running NRO uninstall test suite";
if ! "${BIN_DIR}"/e2e-nrop-uninstall.test ${NO_COLOR} --ginkgo.v --ginkgo.timeout=5h --ginkgo.junit-report=${REPORT_DIR}/uninstall.xml; then
echo "Failed to run NRO uninstall test suite"
exit 2
fi

0 comments on commit ee53bb4

Please sign in to comment.