X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2FMakefile;h=40492aa26be1320897e2dd23e2180b485a96dac2;hb=a40dfaffbd5297e9dae10ff871b62fbfde979830;hp=36ed0a57d0c0293f418182ad3f647db1ac2c5235;hpb=12aa2cf9b6f165943bf1411f4da9c5c69b9ff904;p=osm%2Fdevops.git diff --git a/systest/Makefile b/systest/Makefile index 36ed0a57..40492aa2 100644 --- a/systest/Makefile +++ b/systest/Makefile @@ -183,7 +183,13 @@ images/%.img: echo "No method selected to upload image to VIM" endif -cirros: check_OSM_HOSTNAME check_openstack_env check_vcd_env \ +%.openstack: check_openstack_env + $(Q)$(MAKE) $* + +%s.vcd: check_vcd_env + $(Q)$(MAKE) $* + +cirros: check_OSM_HOSTNAME \ $(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \ $(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz \ images/cirros-0.3.5-x86_64-disk.img @@ -193,7 +199,7 @@ cirros: check_OSM_HOSTNAME check_openstack_env check_vcd_env \ JUNITXML=pytest-$@.xml \ PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test -ns_scale: check_OSM_HOSTNAME check_openstack_env check_vcd_env \ +ns_scale: check_OSM_HOSTNAME \ $(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \ $(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz \ images/cirros-0.3.5-x86_64-disk.img