From f589ad7fa704ef89a0aa0df72430b9a03da4a527 Mon Sep 17 00:00:00 2001 From: Konstantinos Angelopoulos Date: Thu, 25 Jan 2024 16:31:27 +0100 Subject: [PATCH] Revert " Fixed the makefile" (#113) --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e2df7839..22c4d1c5 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ IMAGE_PREFIX := $(REGISTRY)/gardener/extensions NAME := machine-controller-manager-provider-openstack IMAGE_NAME := $(IMAGE_PREFIX)/$(NAME) VERSION := $(shell cat VERSION) -IS_CONTROL_CLUSTER_SEED := true + LEADER_ELECT := "true" # If Integration Test Suite is to be run locally against clusters then export the below variable # with MCM deployment name in the cluster @@ -99,15 +99,14 @@ clean: .PHONY: test-integration test-integration: - @if [[ -f $(PWD)/$(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(PWD)/$(CONTROL_KUBECONFIG); elif [[ -f $(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(CONTROL_KUBECONFIG);else echo "No such file exists for CONTROL_KUBECONFIG";exit 1; fi; \ - if [[ -f $(PWD)/$(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(PWD)/$(TARGET_KUBECONFIG); elif [[ -f $(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(TARGET_KUBECONFIG);else echo "No such file exists for TARGET_KUBECONFIG";exit 1; fi; \ - if [[ -f $(PWD)/$(MACHINECLASS_V1) ]]; then export MACHINECLASS_V1=$(PWD)/$(MACHINECLASS_V1);elif [[ -f $(MACHINECLASS_V1) ]]; then export MACHINECLASS_V1="$(MACHINECLASS_V1)"; fi; \ - if [[ -f $(PWD)/$(MACHINECLASS_V2) ]]; then export MACHINECLASS_V2=$(PWD)/$(MACHINECLASS_V2);elif [[ -f $(MACHINECLASS_V2) ]]; then export MACHINECLASS_V2="$(MACHINECLASS_V2)"; fi; \ + @if [[ -f $(PWD)/$(CONTROL_KUBECONFIG) ]]; then export CONTROL_KUBECONFIG=$(PWD)/$(CONTROL_KUBECONFIG); fi; \ + if [[ -f $(PWD)/$(TARGET_KUBECONFIG) ]]; then export TARGET_KUBECONFIG=$(PWD)/$(TARGET_KUBECONFIG); fi; \ + if [[ -f $(PWD)/$(MACHINECLASS_V1) ]]; then export MACHINECLASS_V1=$(PWD)/$(MACHINECLASS_V1); fi; \ + if [[ -f $(PWD)/$(MACHINECLASS_V2) ]]; then export MACHINECLASS_V2=$(PWD)/$(MACHINECLASS_V2); fi; \ export MC_CONTAINER_IMAGE=$(MC_IMAGE); \ export MCM_CONTAINER_IMAGE=$(MCM_IMAGE); \ export CONTROL_CLUSTER_NAMESPACE=$(CONTROL_NAMESPACE); \ export MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME=$(MACHINE_CONTROLLER_MANAGER_DEPLOYMENT_NAME); \ - export IS_CONTROL_CLUSTER_SEED=$(IS_CONTROL_CLUSTER_SEED); \ .ci/local_integration_test #########################################