From 7dd7e17b25538af6daccc5da129bbe9641ace11b Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Wed, 28 Mar 2018 14:28:21 -0400 Subject: [PATCH] add vcd/openstack explicit rules for test Signed-off-by: Mike Marchetti --- systest/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 -- 2.25.1