Skip to content

Commit

Permalink
Fix suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolovison committed Sep 18, 2024
1 parent f3871a3 commit 67e9e1a
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/scripts/tests/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

set -e

# ------------------------------------
# Env vars
echo "GIT_WORKSPACE=$GIT_WORKSPACE"
if [ "$GIT_WORKSPACE" = "" ]; then
Expand All @@ -28,15 +27,15 @@ CONFIG_DIR="${GIT_WORKSPACE}/config"
RESOURCES_DIR_CRD="${GIT_WORKSPACE}/.github/resources"
OPENDATAHUB_NAMESPACE="opendatahub"
RESOURCES_DIR_PYPI="${GIT_WORKSPACE}/.github/resources/pypiserver/base"
# ------------------------------------

# ------------------------------------
# Functions
get_dspo_image() {
if [ "$REGISTRY_ADDRESS" = "" ]; then
echo "REGISTRY_ADDRESS variable not defined." && exit 1
fi
echo "${REGISTRY_ADDRESS}/data-science-pipelines-operator"
local image="${REGISTRY_ADDRESS}/data-science-pipelines-operator"
echo "Using $image for DSPO image"
echo $image
}

apply_crd() {
Expand Down Expand Up @@ -178,12 +177,15 @@ run_tests_dspa_external_connections() {

undeploy_kind_resources() {
echo "---------------------------------"
echo "Clean up"
echo "Clean up resources created for testing on kind"
echo "---------------------------------"
( cd $GIT_WORKSPACE && make undeploy-kind )
}

remove_namespace_created_for_rhoai() {
echo "---------------------------------"
echo "Clean up resources created for testing on RHOAI"
echo "---------------------------------"
kubectl delete projects $MINIO_NAMESPACE --now || true
kubectl delete projects $MARIADB_NAMESPACE --now || true
kubectl delete projects $PYPISERVER_NAMESPACE --now || true
Expand Down Expand Up @@ -224,9 +226,7 @@ run_rhoai_tests() {
run_tests
run_tests_dspa_external_connections
}
# ------------------------------------

# ------------------------------------
# Run
case "$1" in
--kind)
Expand All @@ -240,4 +240,3 @@ case "$1" in
exit 1
;;
esac
# ------------------------------------

0 comments on commit 67e9e1a

Please sign in to comment.