Cherry-pick calico postrelease test fixes [v3.28]

hack/postrelease/.gitignore

@@ -0,0 +1,2 @@
+.*.stamp
+xunit.xml

hack/postrelease/Dockerfile

@@ -1,13 +1,36 @@
-FROM docker:18.09
+# hadolint global ignore=DL3018
+FROM docker:24
 
-RUN apk add --update bash python python-dev py2-pip py-setuptools openssl-dev curl jq && \
-        rm -rf /var/cache/apk/*
+ARG VERSION
+ARG FLANNEL_VERSION
+ARG OPERATOR_VERSION
+ARG UID
 
-RUN mkdir -p /root/.docker
+ENV VERSION             ${VERSION}
+ENV FLANNEL_VERSION     ${FLANNEL_VERSION}
+ENV NOSE_PROCESSES      ${NOSE_PROCESSES}
+ENV OPERATOR_VERSION    ${OPERATOR_VERSION}
+
+RUN --mount=type=tmpfs,target=/var/cache/apk apk add --no-cache \
+    bash            \
+    python3         \
+    python3-dev     \
+    py3-pip         \
+    py3-yaml        \
+    py3-pytest      \
+    py3-pytest-xdist\
+    py3-requests    \
+    py3-rich        \
+    py-setuptools   \
+    openssl-dev     \
+    curl            \
+    jq              \
+    yq
+
+RUN mkdir -p /root/.docker /code
 COPY config.json /root/.docker/
-COPY requirements.txt /requirements.txt
-COPY *.py /code/
-RUN pip install -r /requirements.txt
+RUN adduser -D -u ${UID} test_user
+USER test_user
 
 # The container is used by mounting the code-under-test to /code
 WORKDIR /code/

hack/postrelease/Makefile

@@ -0,0 +1,68 @@
+include variables.mk
+
+### Binaries we need
+
+bin/yq:
+	$(info Downloading YQ from $(YQ4_URL))
+	@mkdir -p bin
+	@curl -fsSL $(YQ4_URL) -o $(YQ4)
+	@chmod +x $(YQ4)
+
+### Utility!
+
+require_var = $(if \
+                  $(filter-out undefined,$(origin $(1))),\
+                  ,\
+                  $(error The variable $(1) is required but is not defined) \
+          )
+
+require-vars-%:
+	$(foreach var,$(subst -, ,$*),$(call require_var,$(var)))
+
+### Actual rules below here!
+
+.PHONY: create_docker_container clean
+
+all: create_docker_container run_pytests_docker clean_docker_container
+
+## Setting up
+
+create_docker_container: .docker_container.stamp
+
+.docker_container.stamp: bin/yq Dockerfile config.json
+	$(info +++ Building docker container with Calico $(CALICO_VERSION), Operator $(OPERATOR_VERSION), Flannel $(FLANNEL_VERSION))
+	docker buildx build \
+		-t $(CALICO_POSTRELEASE_TEST_IMAGE)              \
+		--build-arg UID=$(shell id -u)                   \
+		--build-arg VERSION=$(CALICO_VERSION)            \
+		--build-arg FLANNEL_VERSION=$(FLANNEL_VERSION)   \
+		--build-arg OPERATOR_VERSION=$(OPERATOR_VERSION) \
+		.
+	@touch .docker_container.stamp
+
+## Execution
+
+run_pytests_docker: create_docker_container
+	$(info +++ Running postrelease tests)
+	@docker run -it --rm                     \
+		-v .:/code                           \
+		-v /run/docker.sock:/run/docker.sock \
+		$(CALICO_POSTRELEASE_TEST_IMAGE)     \
+		pytest -n$(shell nproc) --junitxml=xunit.xml tests
+
+## Cleanup
+
+# `clean` is meant to be run manually, as it also runs clean_xunit, which
+# deletes the xunit file. We actually want that file to exist in e.g. semaphore.
+clean: clean_docker_container clean_xunit clean_bin
+
+clean_xunit:
+	$(RM) xunit.xml
+
+clean_bin:
+	$(RM) -r bin
+
+clean_docker_container: bin/yq
+	$(info +++ Cleaning docker container)
+	@docker rmi $(CALICO_POSTRELEASE_TEST_IMAGE) 2> /dev/null || true
+	$(RM) .docker_container.stamp

hack/postrelease/pytest.ini

@@ -0,0 +1,7 @@
+[pytest]
+markers =
+    slow: marks tests as slow
+    windows: a windows-related test
+    helm: tests relating to the helm chart
+    github: tests which access github to validate files
+    openstack: tests which validate our openstack releases