allow container image to be built in project root or tests directory

Author: pdabelf5

tests/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.5
+# syntax=docker/dockerfile:1.11
 # this is here so we can grab the latest version of kind and have dependabot keep it up to date
 FROM kindest/node:v1.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f
 
@@ -8,27 +8,23 @@ FROM quay.io/skopeo/stable:v1.17.0
 FROM python:3.13@sha256:08471c63c5fdf2644adc142a7fa8d0290eb405cda14c473fbe5b4cd0933af601
 
 RUN apt-get update \
-	&& apt-get install -y curl git \
+	&& apt-get install -y curl git apache2-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /workspace/tests
 
-COPY --link tests/requirements.txt /workspace/tests/
-RUN pip install --require-hashes -r requirements.txt --no-deps
-RUN playwright install --with-deps chromium
 
+COPY --link tests/requirements.txt /workspace/tests/
 COPY --link deployments /workspace/deployments
 COPY --link config /workspace/config
+COPY --link tests /workspace/tests
+COPY --link pyproject.toml /workspace/pyproject.toml
 
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
 	&& install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl \
-	&& apt-get update && apt-get install -y apache2-utils
+    && curl https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz | tar xvz -C /tmp/ && mv /tmp/docker/docker /usr/bin/docker
 
-RUN apt update -y \
-	&& curl https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz | tar xvz -C /tmp/ && mv /tmp/docker/docker /usr/bin/docker
-
-COPY --link tests /workspace/tests
-
-COPY --link pyproject.toml /workspace/
+RUN pip install --require-hashes -r requirements.txt --no-deps
+RUN playwright install --with-deps chromium
 
 ENTRYPOINT ["python3", "-m", "pytest"]

tests/Makefile

@@ -10,6 +10,7 @@ KUBE_CONFIG_FOLDER          = ${HOME}/.kube
 KIND_KUBE_CONFIG_FOLDER     = $(KUBE_CONFIG_FOLDER)/kind
 MINIKUBE_KUBE_CONFIG_FOLDER = $(KUBE_CONFIG_FOLDER)/minikube
 DOCKERFILEPATH              := ${ROOT_DIR}/tests/Dockerfile
+PYTHON                      ?= python3
 IP_FAMILY                   = dual
 IC_TYPE                     ?= nginx-ingress ## The Ingress Controller type to use, "nginx-ingress" or "nginx-plus-ingress".  Defaults to "nginx-ingress"
 SHOW_IC_LOGS                ?= no ## Should the tests show the Ingress Controller logs on failure, "yes" or "no". Defaults to "no"
@@ -36,7 +37,7 @@ help: ## Show available make targets
 
 .PHONY: build
 build: ## Run build
-	docker build -t $(TEST_PREFIX):$(TEST_TAG) -f $(DOCKERFILEPATH) ..
+	docker build -t $(TEST_PREFIX):$(TEST_TAG) -f $(DOCKERFILEPATH) $(ROOT_DIR)
 
 
 $(KUBE_CONFIG_FOLDER):
@@ -51,9 +52,49 @@ $(MINIKUBE_KUBE_CONFIG_FOLDER): $(KUBE_CONFIG_FOLDER)
 	@mkdir -p $@
 
 
+.PHONY: setup-venv
+setup-venv:
+	$(PYTHON) -m venv $(ROOT_DIR)/tests/venv;
+	source $(ROOT_DIR)/tests/venv/bin/activate \
+	&& pip install --require-hashes -r requirements.txt --no-deps \
+	&& playwright install --with-deps chromium
+
+
+.PHONY: clean-venv
+clean-venv:
+	@rm -rf $(ROOT_DIR)/tests/venv
+
+
+.PHONY: run-local-tests
+run-local-tests: ## Run tests
+	source $(ROOT_DIR)/tests/venv/bin/activate \
+	&& pytest \
+		--image=$(BUILD_IMAGE) \
+		--image-pull-policy=$(PULL_POLICY) \
+		--deployment-type=$(DEPLOYMENT_TYPE) \
+		--ic-type=$(IC_TYPE) \
+		--service=$(SERVICE) \
+		--node-ip=$(NODE_IP) \
+		--show-ic-logs=$(SHOW_IC_LOGS) \
+		--plus-jwt=$(PLUS_JWT) \
+		-sv \
+		$(PYTEST_ARGS)
+
+
 .PHONY: run-tests
 run-tests: ## Run tests
-	docker run --rm -v $(KUBE_CONFIG_FOLDER):/root/.kube $(TEST_PREFIX):$(TEST_TAG) --context=$(CONTEXT) --image=$(BUILD_IMAGE) --image-pull-policy=$(PULL_POLICY) --deployment-type=$(DEPLOYMENT_TYPE) --ic-type=$(IC_TYPE) --service=$(SERVICE) --node-ip=$(NODE_IP) --show-ic-logs=$(SHOW_IC_LOGS) $(PYTEST_ARGS)
+	docker run --rm -v $(KUBE_CONFIG_FOLDER):/root/.kube \
+		$(TEST_PREFIX):$(TEST_TAG) \
+		--context=$(CONTEXT) \
+		--image=$(BUILD_IMAGE) \
+		--image-pull-policy=$(PULL_POLICY) \
+		--deployment-type=$(DEPLOYMENT_TYPE) \
+		--ic-type=$(IC_TYPE) \
+		--service=$(SERVICE) \
+		--node-ip=$(NODE_IP) \
+		--show-ic-logs=$(SHOW_IC_LOGS) \
+		--plus-jwt=$(PLUS_JWT) \
+		$(PYTEST_ARGS)
 
 
 .PHONY: run-tests-in-kind