Skip to content

Commit f6d95b7

Browse files
authored
Merge pull request #423 from mbaldessari/common-automatic-update
common automatic update
2 parents 5cdacd8 + bc2b87f commit f6d95b7

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

common/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,15 @@ validate-schema: ## validates values files against schema in common/clustergroup
164164

165165
.PHONY: validate-prereq
166166
validate-prereq: ## verify pre-requisites
167+
$(eval GLOBAL_PATTERN := $(shell yq -r .global.pattern values-global.yaml))
168+
@if [ $(NAME) != $(GLOBAL_PATTERN) ]; then\
169+
echo "";\
170+
echo "WARNING: folder directory is \"$(NAME)\" and global.pattern is set to \"$(GLOBAL_PATTERN)\"";\
171+
echo "this can create problems. Please make sure they are the same!";\
172+
echo "";\
173+
fi
167174
@if [ ! -f /run/.containerenv ]; then\
168175
echo "Checking prerequisites:";\
169-
for t in $(EXECUTABLES); do if ! which $$t > /dev/null 2>&1; then echo "No $$t in PATH"; exit 1; fi; done;\
170-
echo " Check for '$(EXECUTABLES)': OK";\
171176
echo -n " Check for python-kubernetes: ";\
172177
if ! ansible -m ansible.builtin.command -a "{{ ansible_python_interpreter }} -c 'import kubernetes'" localhost > /dev/null 2>&1; then echo "Not found"; exit 1; fi;\
173178
echo "OK";\
@@ -214,7 +219,7 @@ argo-healthcheck: ## Checks if all argo applications are synced
214219
.PHONY: qe-tests
215220
qe-tests: ## Runs the tests that QE runs
216221
@set -e; if [ -f ./tests/interop/run_tests.sh ]; then \
217-
./tests/interop/run_tests.sh; \
222+
pushd ./tests/interop; ./run_tests.sh; popd; \
218223
else \
219224
echo "No ./tests/interop/run_tests.sh found skipping"; \
220225
fi

0 commit comments

Comments
 (0)