X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2FMakefile;h=a5b63039a293098e540ddbf15df40235f81a1d0f;hb=3388212eac8fa6aff2f5d766e62e33962816501b;hp=b2a66ec9da685a4756fa98257a3c91ff1471c023;hpb=aa24514a2010f3e14eb9f02ced504a64004da710;p=osm%2Fdevops.git diff --git a/systest/Makefile b/systest/Makefile index b2a66ec9..a5b63039 100644 --- a/systest/Makefile +++ b/systest/Makefile @@ -38,6 +38,7 @@ VIM_EMU ?= TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//') + ifdef OS_AUTH_URL OPTION_OS_AUTH_URL=--os-url $(OS_AUTH_URL) endif @@ -192,7 +193,7 @@ endif %.openstack: check_openstack_env $(Q)$(MAKE) $* -%s.vcd: check_vcd_env +%.vcd: check_vcd_env $(Q)$(MAKE) $* cirros: check_OSM_HOSTNAME \ @@ -250,4 +251,8 @@ ping_pong: check_OSM_HOSTNAME check_openstack_env \ 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