From: marchettim <mmarchetti@sandvine.com>
Date: Tue, 20 Nov 2018 20:41:07 +0000 (+0100)
Subject: Merge "cirros test code changes for VCD"
X-Git-Tag: v5.0.0~20
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=95c0173af060c3f475fdac79c4480d6ba38bf39b;hp=-c;p=osm%2Fdevops.git

Merge "cirros test code changes for VCD"
---

95c0173af060c3f475fdac79c4480d6ba38bf39b
diff --combined systest/Makefile
index 75ab5563,df43019b..a5b63039
--- a/systest/Makefile
+++ b/systest/Makefile
@@@ -38,7 -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
@@@ -193,7 -192,7 +193,7 @@@ endi
  %.openstack: check_openstack_env
  	$(Q)$(MAKE) $*
  
- %s.vcd: check_vcd_env
+ %.vcd: check_vcd_env
  	$(Q)$(MAKE) $*
  
  cirros: check_OSM_HOSTNAME \