X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;h=07c0ed88c8b33d8cd2c5cb1c02fb4c20a6424def;hb=33205b2d01d9991e01eff47d817afcf9fc4634dd;hp=eb9711f7db84f5de53dde90be8a75e0959c04084;hpb=c3733e1cfa5e981130a698a1b8563a98ba3058fd;p=osm%2Fdevops.git

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index eb9711f7..07c0ed88 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -31,7 +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)/upgrade_descriptor_version.py
+TEST_PKG     := $(TOOLS_DIR)/validate_descriptor.py
 BUILD_VNFD   := $(shell readlink -f .|sed -e 's/\/.*descriptor-packages//' | grep vnfd)
 
 DEP_FILES = $(wildcard src/*)
@@ -67,7 +67,7 @@ $(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:
@@ -76,7 +76,7 @@ clean:
 
 test:
 	$(Q)echo -n testing $(shell readlink -f src/*.yaml)  "             " 
-	$(Q)$(TEST_PKG) --test src/*.yaml
+	$(Q)$(TEST_PKG) src/*.yaml
 	$(Q)echo OK
         
 .DEFAULT_GOAL := all