OSM_RO_HOSTNAME ?=
OS_AUTH_URL ?=
OS_USERNAME ?=
-OS_PASSWORD_NAME ?=
+OS_PASSWORD ?=
OS_PROJECT_NAME ?=
VIM_CONFIG ?=
VCD_AUTH_URL ?=
VCD_PASSWORD ?=
VCD_TENANT_NAME ?=
VCD_ORGANIZATION ?=
+VIM_EMU ?=
TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//')
+
ifdef OS_AUTH_URL
OPTION_OS_AUTH_URL=--os-url $(OS_AUTH_URL)
endif
_run_test: report_dir
-$(Q)py.test \
- --osmhost $(OSM_HOSTNAME) \
+ --osmhost $(OSM_HOSTNAME) --sol005 \
$(OPTION_RO_HOSTNAME) \
$(OPTION_OS_AUTH_URL) \
$(OPTION_OS_USERNAME) \
OSM_IMAGE_PREFIX ?=
sys_path ?= $(TOPDIR)systest
+ifdef VIM_EMU
+# VIM emulator does not need images pushed to glance.
+else
ifdef OS_AUTH_URL
images/%.qcow2 images/%.img:
$(Q)openstack image show $(OSM_IMAGE_PREFIX)$(shell basename $@) || \
sh -c "make images/cache/$(shell basename $@) && openstack image create --file images/cache/$(shell basename $@) $(OSM_IMAGE_PREFIX)$(shell basename $@)"
endif
+endif
+
ifdef VCD_AUTH_URL
images/%.img:
ovf_converter images/cache/$(OSM_IMAGE_PREFIX)$(shell basename $@) -n cirros
%.openstack: check_openstack_env
$(Q)$(MAKE) $*
-%s.vcd: check_vcd_env
+%.vcd: check_vcd_env
$(Q)$(MAKE) $*
cirros: check_OSM_HOSTNAME \
JUNITXML=pytest-$@.xml \
PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test
-.PHONY: report_dir cirros vim smoke ping_pong
+stage_4_tests = cirros
+
+openstack_stage_4: $(stage_4_tests)
+
+.PHONY: report_dir cirros vim smoke ping_pong openstack_stage_4 stage_4_tests