diff options
| -rwxr-xr-x | ete-k8s.sh | 3 | ||||
| -rw-r--r-- | resources/config/eteshare/config/robot_properties.py | 2 | ||||
| -rwxr-xr-x | scripts/etescript/vnfsdk-etescript.sh | 8 | ||||
| -rw-r--r-- | values.yaml | 5 |
4 files changed, 10 insertions, 8 deletions
@@ -28,7 +28,8 @@ if [ "$1" == "" ] || [ "$2" == "" ]; then echo " clamp.robot: clamp" echo "" echo " demo.robot: InitDemo, InitCustomer, APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG," - echo " InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, instantiateVFWCL, instantiateVFWDT" + echo " InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, " + echo " instantiateVFWCL, instantiateVFWDT, instantiateVFWCLDN" echo "" echo " health-check.robot: health, core, small, medium, 3rdparty, api, datarouter, externalapi, health-aaf, health-aai, health-appc," echo " health-clamp, health-cli, health-dcae, health-dmaap, health-log, health-modeling, health-msb," diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py index 951c0a1..73336d9 100644 --- a/resources/config/eteshare/config/robot_properties.py +++ b/resources/config/eteshare/config/robot_properties.py @@ -111,6 +111,8 @@ GLOBAL_INJECTED_SO_VNFM_IP_ADDR = 'so-vnfm-adapter.{{include "common.namespace" GLOBAL_INJECTED_UBUNTU_1404_IMAGE = '{{ .Values.ubuntu14Image }}' GLOBAL_INJECTED_UBUNTU_1604_IMAGE = '{{ .Values.ubuntu16Image }}' GLOBAL_INJECTED_VM_IMAGE_NAME = '{{ .Values.ubuntu14Image }}' +GLOBAL_INJECTED_DANOS_IMAGE_NAME = '{{ .Values.danosImage }}' +GLOBAL_INJECTED_DANOS_FLAVOR = '{{ .Values.danosFlavor }}' GLOBAL_INJECTED_VID_IP_ADDR = 'vid.{{include "common.namespace" .}}' GLOBAL_INJECTED_VM_FLAVOR = '{{ .Values.openStackFlavourMedium }}' GLOBAL_INJECTED_VNFSDK_IP_ADDR = 'refrepo.{{include "common.namespace" .}}' diff --git a/scripts/etescript/vnfsdk-etescript.sh b/scripts/etescript/vnfsdk-etescript.sh index ff3bb5b..f1d3969 100755 --- a/scripts/etescript/vnfsdk-etescript.sh +++ b/scripts/etescript/vnfsdk-etescript.sh @@ -1,8 +1,4 @@ -# 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. +# SPDX-License-Identifier: Apache-2.0 #!/bin/bash @@ -16,7 +12,7 @@ SDCVALID=sdc-valid SDCINVALID=sdc-invalid -ROBOTPOD=$(kubectl -n $NAMESPACE get pods --no-headers=true -o custom-columns=:metadata.name | grep robot-robot ) +ROBOTPOD=$(kubectl -n $NAMESPACE get pods --no-headers=true -o custom-columns=:metadata.name | grep robot ) SDCONBOARDINGPOD=$(kubectl -n $NAMESPACE get pods --no-headers=true -o custom-columns=:metadata.name | grep sdc-onboarding-be | grep -v cassandra) generate_ca_key_cert_and_package_cert_issued_by_CA () { diff --git a/values.yaml b/values.yaml index f142e47..b64e98d 100644 --- a/values.yaml +++ b/values.yaml @@ -22,7 +22,7 @@ global: # global defaults # application image repository: nexus3.onap.org:10001 -image: onap/testsuite:1.5.4 +image: onap/testsuite:1.6.1 pullPolicy: Always ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 @@ -104,6 +104,9 @@ openStackDomainIdRegionThree: "Default" ubuntu14Image: "Ubuntu_14_trusty" # Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE ubuntu16Image: "Ubuntu_16_xenial" +# DANOS image and flavor references +danosImage: "danos-ves-image" +danosFlavor: "danos" # GLOBAL_INJECTED_SCRIPT_VERSION. Maps to GLOBAL_INJECTED_SCRIPT_VERSION scriptVersion: "1.4.0" # Openstack network to which VNFs will bind their primary (first) interface. Maps to GLOBAL_INJECTED_NETWORK |