X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2FMakefile;h=90c56d50a855fb6eaaf752c5d758c88d4adfdfce;hb=refs%2Fchanges%2F79%2F5579%2F1;hp=ce5c68a6eeee2e4836cec8b9b3396b03b339a1ce;hpb=8d38950dbdd0459d78fef2c594236e03d7945e66;p=osm%2Fdevops.git diff --git a/systest/Makefile b/systest/Makefile index ce5c68a6..90c56d50 100644 --- a/systest/Makefile +++ b/systest/Makefile @@ -140,12 +140,15 @@ $(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/%.tar.gz: $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/%.tar.gz: $(MAKE) -C $(DESCRIPTOR_DIR)/vnfd/pong_vnf -$(DESCRIPTOR_DIR)/vnfd/ping_pong_ns/build/%.tar.gz: +$(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/%.tar.gz: $(MAKE) -C $(DESCRIPTOR_DIR)/nsd/ping_pong_ns -ping_pong: check_OSM_HOSTNAME check_openstack_env +ping_pong: check_OSM_HOSTNAME check_openstack_env \ + $(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz \ + $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz \ + $(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/ping_pong_ns.tar.gz $(Q)$(MAKE) \ - TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz" \ + TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz,$(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz" \ TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/ping_pong_ns.tar.gz \ JUNITXML=pytest-$@.xml \ PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test