X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;h=4226ebfcf80417554519bc0d68723961608e1854;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=eb9711f7db84f5de53dde90be8a75e0959c04084;hpb=04720c7215dfe92ce96ede63da5a6377338a7c9a;p=osm%2Fdevops.git

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index eb9711f7..4226ebfc 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -20,7 +20,7 @@ TOOLS_DIR := $(TOPDIR)/descriptor-packages/tools
 PKG_BASE_NAME := $(shell basename $(shell pwd))
 PKG_NAME      := $(addsuffix .tar.gz, $(PKG_BASE_NAME))
 
-CHARM_DIR        := $(TOPDIR)/juju-charms
+CHARM_DIR        := $(TOPDIR)/charms
 CHARM_SRC_DIR    := $(CHARM_DIR)/layers
 CHARM_DOCKER_TAG := charm-tools
 CHARM_BUILD_DIR  := $(CHARM_DIR)/builds
@@ -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,16 +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) --test src/*.yaml
+	$(Q)echo -n testing $(shell readlink -f src/*.yaml)  "             "
+	$(Q)$(TEST_PKG) src/*.yaml
 	$(Q)echo OK
-        
+
 .DEFAULT_GOAL := all