Add docker push rules

[osm/devops.git] / descriptor-packages / mk / pkg.mk

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index 9c623c4..07c0ed8 100644 (file)
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -31,6 +31,7 @@ Q=@
 GEN_VNFD_PKG := $(TOOLS_DIR)/gen_vnfd_pkg.sh
 GEN_NSD_PKG  := $(TOOLS_DIR)/gen_nsd_pkg.sh
 GEN_PKG      := $(TOOLS_DIR)/generate_descriptor_pkg.sh
+TEST_PKG     := $(TOOLS_DIR)/validate_descriptor.py
 BUILD_VNFD   := $(shell readlink -f .|sed -e 's/\/.*descriptor-packages//' | grep vnfd)
 
 DEP_FILES = $(wildcard src/*)
@@ -66,11 +67,16 @@ $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
        $(CHARM_DIR) $(CHARM_DOCKER_TAG) charm-build -o $(CHARM_DIR) $<
 else
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
-       $(Q)charm-build -o $(CHARM_DIR) $<
+       $(Q)charm build -o $(CHARM_DIR) $<
 endif
  
 clean:
        $(Q)rm -rf $(BUILD_DIR)
        $(Q)rm -rf $(CHARM_BUILD_DIR)
 
+test:
+       $(Q)echo -n testing $(shell readlink -f src/*.yaml)  "             " 
+       $(Q)$(TEST_PKG) src/*.yaml
+       $(Q)echo OK
+        
 .DEFAULT_GOAL := all