diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-09-23 13:21:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-23 13:21:57 +0000 |
| commit | 0713941d88dadd5689fefe514c8f45c9b7f5752f (patch) | |
| tree | 09f96f3d7c79ffdb699c9f89b5a687e55c18038c | |
| parent | ce3b6135fd8d91cabc39cf56d2c657a8daf0c29c (diff) | |
| parent | 2e2d97f371e5710db54ca5c9951bb0998af9bbf7 (diff) | |
Merge "Update sdc nightly"
| -rw-r--r-- | plans/sdc/nightly/setup.sh | 42 | ||||
| -rw-r--r-- | tests/sdc/nightly/test1.robot | 4 |
2 files changed, 39 insertions, 7 deletions
diff --git a/plans/sdc/nightly/setup.sh b/plans/sdc/nightly/setup.sh index 7587d096..8c0336c9 100644 --- a/plans/sdc/nightly/setup.sh +++ b/plans/sdc/nightly/setup.sh @@ -1,11 +1,43 @@ #!/bin/bash +# +# Copyright 2019 © Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# -source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad +# It can enable HTTPS for SDC sanity tests +export SDC_TEST_HTTPS="${SDC_TEST_HTTPS:-false}" -BE_IP=`get-instance-ip.sh sdc-BE` -echo BE_IP=${BE_IP} +# By default all images are from remote upstream registry, this option +# provides the chance to test locally built images +export SDC_LOCAL_IMAGES="${SDC_LOCAL_IMAGES:-false}" +# For this to take effect SDC_LOCAL_IMAGES must be enabled... +# +# The path to the local sdc git repo from which the local images have +# been built - it also affects the tag used - if left empty *AND* +# local images are used *AND* SDC_LOCAL_TAG is unset then the tag +# will be set to: 'latest' +# +# BEWARE: Using local images with an incorrect git repo could lead to +# problems...set SDC_LOCAL_GITREPO or GERRIT_BRANCH properly... +export SDC_LOCAL_GITREPO="${SDC_LOCAL_GITREPO}" -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v BE_IP:${BE_IP}" +# For this to take effect SDC_LOCAL_IMAGES must be enabled... +# +# This will set the tag for local images - leaving this empty *AND* +# with unset SDC_LOCAL_GITREPO the local images will fallback to the +# tag: 'latest' +export SDC_LOCAL_TAG="${SDC_LOCAL_TAG}" +source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad diff --git a/tests/sdc/nightly/test1.robot b/tests/sdc/nightly/test1.robot index 3705d8f5..2b92be74 100644 --- a/tests/sdc/nightly/test1.robot +++ b/tests/sdc/nightly/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8181 + CreateSession sdc-fe ${SDC_FE_PROTOCOL}://localhost:${SDC_FE_PORT} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-fe /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} |