From: Mike Marchetti Date: Fri, 17 Aug 2018 17:54:21 +0000 (-0400) Subject: Add smoke tests support for REL4 (lightweight) X-Git-Tag: v5.0.0~129 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F6422%2F1;p=osm%2Fdevops.git Add smoke tests support for REL4 (lightweight) Change-Id: I5b0d9b3c8578510e8e3fb7002b0a9c573479bed6 Signed-off-by: Mike Marchetti --- diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 93a11128..a92e1ba7 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -659,8 +659,8 @@ function generate_docker_env_files() { if [ ! -f /etc/osm/docker/ro.env ]; then echo "RO_DB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" |sudo tee /etc/osm/docker/ro.env fi - echo "OS_NOTIFIER_URI=http://${DEFAULT_IP}:8662" |sudo tee ${OSM_DEVOPS}/installers/docker/mon.env - cmp_overwrite ${OSM_DEVOPS}/installers/docker/mon.env /etc/osm/docker/mon.env + echo "OS_NOTIFIER_URI=http://${DEFAULT_IP}:8662" |tee /tmp/mon.env + cmp_overwrite /tmp/mon.env /etc/osm/docker/mon.env echo "Finished generation of docker env files" } diff --git a/systest/Makefile b/systest/Makefile index 6321901f..b2a66ec9 100644 --- a/systest/Makefile +++ b/systest/Makefile @@ -26,7 +26,7 @@ OSM_HOSTNAME ?= OSM_RO_HOSTNAME ?= OS_AUTH_URL ?= OS_USERNAME ?= -OS_PASSWORD_NAME ?= +OS_PASSWORD ?= OS_PROJECT_NAME ?= VIM_CONFIG ?= VCD_AUTH_URL ?= @@ -34,6 +34,7 @@ VCD_USERNAME ?= VCD_PASSWORD ?= VCD_TENANT_NAME ?= VCD_ORGANIZATION ?= +VIM_EMU ?= TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//') @@ -169,11 +170,16 @@ images/cache/Fedora-x86_64-20-20131211.1-sda-pong.qcow2: 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 diff --git a/systest/lib/osm/fixtures.py b/systest/lib/osm/fixtures.py index 889de153..c1becc8d 100644 --- a/systest/lib/osm/fixtures.py +++ b/systest/lib/osm/fixtures.py @@ -20,7 +20,7 @@ import json def osm_add_options(parser): parser.addoption("--osmhost", default="", help="osm hostname") - parse.addoption("--sol005",action="store_true", help="enable sol005 API") + parser.addoption("--sol005",action="store_true", help="enable sol005 API") parser.addoption("--osm_ro_host", default="", help="osm ro_host") parser.addoption("--osm-descriptor-packages", default="", help="location of descriptor packages") parser.addoption("--osm-vnfd-descriptor-packages", default="", help="vnfd packages to test") @@ -50,7 +50,7 @@ def osm(request): ns_name_prefix=request.config.getoption("--osm-ns-name-prefix") return osm.Osm(osmhost, ro_host=osm_ro_host, - sol005=sol005 + sol005=sol005, descriptors_dir=descriptors_dir, vnfd_descriptors_list=vnfd_descriptors_list, nsd_descriptors_list=nsd_descriptors_list,