E2E: Skip pulling unused images

Also try to ensure that the /var/www/html folder exists before moving
the e2e image archive there.

Signed-off-by: Lennart Jern <[email protected]>

Author: lentzi90

Makefile

@@ -197,7 +197,7 @@ $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/cluster-template.yaml: $(E2E_KUSTOMIZE_DIR)/wit
 $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/cluster-template-%.yaml: $(E2E_KUSTOMIZE_DIR)/% $(KUSTOMIZE) FORCE
 	$(KUSTOMIZE) build "$<" > "$@"
 
-e2e-prerequisites: $(GINKGO) e2e-templates e2e-image test-e2e-image-prerequisites ## Build all artifacts required by e2e tests
+e2e-prerequisites: $(GINKGO) e2e-templates e2e-image ## Build all artifacts required by e2e tests
 
 # Can be run manually, e.g. via:
 # export OPENSTACK_CLOUD_YAML_FILE="$(pwd)/clouds.yaml"
@@ -221,12 +221,6 @@ build-e2e-tests: $(GINKGO)
 e2e-image: CONTROLLER_IMG_TAG = "gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e"
 e2e-image: docker-build
 
-# Pull all the images references in test/e2e/data/e2e_conf.yaml
-test-e2e-image-prerequisites:
-	docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
-	docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
-	docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
-
 CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
 CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
 .PHONY: test-conformance

scripts/ci-e2e.sh

@@ -100,6 +100,7 @@ prerequisites_log="${ARTIFACTS}/logs/e2e-prerequisites.log"
     retry 10 10 scp $(get_ssh_common_args) "${container_archive}" "cloud@${CONTROLLER_IP}:capo-e2e-image.tar"
     retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo chown root:root capo-e2e-image.tar
     retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo chmod u=rw,g=r,o=r capo-e2e-image.tar
+    retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo mkdir -p /var/www/html
     retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo mv capo-e2e-image.tar /var/www/html/capo-e2e-image.tar
 ) >"$prerequisites_log" 2>&1 &
 build_pid=$!