X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=Makefile;h=d166862be323de9b4c66ea1c6a8c2c59454932d5;hp=1043fbe02e3ba62e0a30f78a350092c105279f76;hb=195c27364fbf1f907fd78c298cd8539e2f0b83bf;hpb=ee64bd1814afaa35241dd5c7c907e43ea6b9f6ac diff --git a/Makefile b/Makefile index 1043fbe..d166862 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ KITCHEN_OPTS_TEST?="" all: @echo "make install - Install into DESTDIR" + @echo "make lint - Run lint tests" @echo "make test - Run tests" @echo "make kitchen - Run Kitchen CI tests (create, converge, verify)" @echo "make clean - Cleanup after tests run" @@ -45,6 +46,9 @@ install: [ -d $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) ] || mkdir -p $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) cp -a metadata/service/* $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) +lint: + [ ! -d tests ] || (cd tests; ./run_tests.sh lint) + test: [ ! -d tests ] || (cd tests; ./run_tests.sh) @@ -65,7 +69,7 @@ release-minor: check-changes [ ! -f debian/changelog ] || dch -v $(VERSION_MAJOR).$(NEW_MINOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version" make genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION) (git add -u; git commit -m "Version $(VERSION_MAJOR).$(NEW_MINOR_VERSION)") - git tag -s -m $(NEW_MAJOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION) + git tag -s -m $(VERSION_MAJOR).$(NEW_MINOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION) check-changes: @git log --pretty=oneline --decorate $(VERSION)..HEAD | grep -Eqc '.*' || (echo "No new changes since version $(VERSION)"; exit 1)