From 5692792277c76f4582079f4394e621d0727bb27a Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Wed, 12 Oct 2022 18:23:12 +0300 Subject: [PATCH 1/2] Fixing makefile check --- deploy/kubernetes/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile index 295b238cef5..613053d8a12 100644 --- a/deploy/kubernetes/Makefile +++ b/deploy/kubernetes/Makefile @@ -49,11 +49,11 @@ ci-clone-kibana-repository: cp $(FILE_REPO) $(ELASTIC_AGENT_REPO)/$(ELASTIC_AGENT_REPO_PATH) ## ci-create-kubernetes-templates-pull-request : Create the pull request for the kubernetes templates +$(eval HASDIFF =$(shell sh -c "git status | grep $(FILE_REPO) | wc -l")) .PHONY: ci-create-kubernetes-templates-pull-request ci-create-kubernetes-templates-pull-request: - HASDIFF=`git status | grep $(FILE_REPO) | wc -l`; \ - echo $${HASDIFF} -ifeq ($${HASDIFF},1) + echo $(HASDIFF) +ifeq ($(HASDIFF),1) echo "INFO: Create branch to update k8s templates" git config user.name obscloudnativemonitoring git config user.email obs-cloudnative-monitoring@elastic.co @@ -79,8 +79,7 @@ else --base main \ --head $(ELASTIC_AGENT_BRANCH) \ --reviewer elastic/obs-cloudnative-monitoring -endif - +endif else echo "No differences found with kibana git repository" endif From 7ae7db30bc27b7c50071e01fdd5fdbc612a28659 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Wed, 12 Oct 2022 18:36:03 +0300 Subject: [PATCH 2/2] Fixing makefile check --- deploy/kubernetes/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile index 613053d8a12..1163b1d00a6 100644 --- a/deploy/kubernetes/Makefile +++ b/deploy/kubernetes/Makefile @@ -52,7 +52,6 @@ ci-clone-kibana-repository: $(eval HASDIFF =$(shell sh -c "git status | grep $(FILE_REPO) | wc -l")) .PHONY: ci-create-kubernetes-templates-pull-request ci-create-kubernetes-templates-pull-request: - echo $(HASDIFF) ifeq ($(HASDIFF),1) echo "INFO: Create branch to update k8s templates" git config user.name obscloudnativemonitoring