fix: create a script to make the make target cleaner (#1711)

* fix: create a script to make the make target cleaner

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>
Co-Authored-By: Claude <noreply@anthropic.com>

* fix: address review comments

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

* fix: mismatch in naming the make targets

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

---------

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>

Author: dbasunag

Dockerfile.testops

@@ -31,17 +31,25 @@ RUN ARCH="${TARGETARCH:-amd64}" && \
     echo "$(<kubectl.sha256) kubectl" | sha256sum -c - && \
     install -m 0755 kubectl /usr/local/bin/ && rm -f kubectl kubectl.sha256
 
-# Install poetry and pytest
-RUN pip install --no-cache-dir poetry pytest
-
 # Give write permissions to all copied folders and change ownership to odh user
 RUN chown -R odh:odh /home/odh && \
     chmod -R 755 api/ manifests/ scripts/
+# Install poetry and pytest (as root, into the app-root virtualenv)
+RUN pip install --no-cache-dir poetry pytest
+
 RUN chown -R odh:odh /opt/app-root/src/
+
+# Disable the base image's auto-activation of /opt/app-root virtualenv so
+# Poetry creates its own in-project .venv instead of installing into root-owned dirs
+ENV VIRTUAL_ENV="" \
+    BASH_ENV="" \
+    ENV="" \
+    PROMPT_COMMAND="" \
+    POETRY_VIRTUALENVS_IN_PROJECT=true
+
 # Switch to odh user
 USER odh
 
-# Add user's pip bin to PATH
 ENV PATH="/home/odh/.local/bin:$PATH"
 
 # Set entrypoint to make command

jobs/async-upload/odh_rules.mk

@@ -6,26 +6,24 @@ deploy-mr-odh:
 undeploy-mr-odh:
 	cd ../../ && ./scripts/undeploy_on_odh.sh
 
-.PHONY: test-e2e-odh
-test-e2e-odh: deploy-mr-odh deploy-local-registry deploy-test-minio
-	@echo "Running e2e tests..."
-	@set -a; . ../../scripts/manifests/minio/.env; set +a; \
+.PHONY: test-e2e-odh-async-jobs
+test-e2e-odh-async-jobs: deploy-mr-odh deploy-local-registry deploy-test-minio
+	@echo "Running Async Jobs e2e tests..."
+	@( \
+	trap 'rm -f ../../scripts/manifests/minio/.env' EXIT; \
+	set -a; . ../../scripts/manifests/minio/.env; set +a; \
 	mkdir -p ../../results; \
-	export AUTH_TOKEN=$$(kubectl config view --raw -o jsonpath="{.users[?(@.name==\"$$(kubectl config view -o jsonpath="{.contexts[?(@.name==\"$$(kubectl config current-context)\")].context.user}")\")].user.token}") && \
-	export VERIFY_SSL=False && \
-	export MR_NAMESPACE=$$(kubectl get datasciencecluster default-dsc -o jsonpath='{.spec.components.modelregistry.registriesNamespace}') && \
-	export MR_HOST_URL="https://$$(kubectl get service -n "$$MR_NAMESPACE" model-registry -o jsonpath='{.metadata.annotations.routing\.opendatahub\.io\/external-address-rest}')" && \
-	export MR_ENDPOINT=$$(kubectl get service -n "$$MR_NAMESPACE" model-registry -o jsonpath='{.metadata.annotations.routing\.opendatahub\.io\/external-address-rest}' | cut -d: -f1) && \
-	export MODEL_SYNC_REGISTRY_SERVER_ADDRESS="https://$$MR_ENDPOINT" && \
-	export MODEL_SYNC_REGISTRY_PORT="443" && \
-	export MODEL_SYNC_REGISTRY_IS_SECURE="false" && \
-	export MODEL_SYNC_REGISTRY_USER_TOKEN="$$AUTH_TOKEN" && \
-	export CONTAINER_IMAGE_URI=$$(../../scripts/get_async_upload_image.sh) && \
-	poetry install --all-extras --with integration && poetry run pytest --e2e tests/integration/ -svvv -rA --html=../../results/report.html --junit-xml=../../results/xunit_report.xml --self-contained-html -o junit_suite_name=odh-async-upload && \
-	rm -f ../../scripts/manifests/minio/.env
+	. ../../scripts/odh_env.sh && \
+	poetry install --all-extras --with integration && \
+	poetry run pytest --e2e tests/integration/ -svvv -rA \
+		--html=../../results/report.html \
+		--junit-xml=../../results/xunit_report.xml \
+		--self-contained-html \
+		-o junit_suite_name=odh-async-upload \
+	)
 
-.PHONY: test-e2e-port-cleanup
-test-e2e-odh-cleanup: undeploy-mr-odh undeploy-minio undeploy-local-kind-registry
+.PHONY: test-e2e-odh-async-jobs-cleanup
+test-e2e-odh-async-jobs-cleanup: undeploy-mr-odh undeploy-minio undeploy-local-kind-registry
 	@echo "Cleaning up port-forward processes..."
 	@if [ -f .port-forwards.pid ]; then \
 		kill $$(cat .port-forwards.pid) || true; \

scripts/odh_env.sh

@@ -0,0 +1,30 @@
+# Common ODH environment variables for test targets.
+# Usage: . scripts/odh_env.sh
+#
+# Exported variables:
+#   AUTH_TOKEN, VERIFY_SSL, MR_NAMESPACE, MR_HOST_URL, MR_ENDPOINT,
+#   MODEL_SYNC_REGISTRY_SERVER_ADDRESS, MODEL_SYNC_REGISTRY_PORT,
+#   MODEL_SYNC_REGISTRY_IS_SECURE, MODEL_SYNC_REGISTRY_USER_TOKEN,
+#   CONTAINER_IMAGE_URI
+
+SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+
+AUTH_TOKEN=$(kubectl config view --raw -o jsonpath="{.users[?(@.name==\"$(kubectl config view -o jsonpath="{.contexts[?(@.name==\"$(kubectl config current-context)\")].context.user}")\")].user.token}")
+export AUTH_TOKEN
+
+export VERIFY_SSL=False
+
+MR_NAMESPACE=$(kubectl get datasciencecluster default-dsc -o jsonpath='{.spec.components.modelregistry.registriesNamespace}')
+export MR_NAMESPACE
+
+MR_ENDPOINT=$(kubectl get service -n "${MR_NAMESPACE}" model-registry -o jsonpath='{.metadata.annotations.routing\.opendatahub\.io\/external-address-rest}')
+export MR_HOST_URL="https://${MR_ENDPOINT}"
+MR_ENDPOINT="${MR_ENDPOINT%%:*}"
+export MR_ENDPOINT
+
+export MODEL_SYNC_REGISTRY_SERVER_ADDRESS="https://${MR_ENDPOINT}"
+export MODEL_SYNC_REGISTRY_PORT="443"
+export MODEL_SYNC_REGISTRY_IS_SECURE="false"
+export MODEL_SYNC_REGISTRY_USER_TOKEN="${AUTH_TOKEN}"
+CONTAINER_IMAGE_URI=$("${SCRIPT_DIR}/get_async_upload_image.sh")
+export CONTAINER_IMAGE_URI