diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-11-20 22:22:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-20 22:22:11 +0000 |
| commit | 517df2af21ceb0d7ff186934993e228454bebeee (patch) | |
| tree | 042a3475f436d0b3595c13f32d9d0216e45b2aa3 | |
| parent | 0c798b22b59a995c6a2d99ebb8d9aa15de528113 (diff) | |
| parent | 92ee8162d3956dd183d3f14b3125985809519249 (diff) | |
Merge "Change Robot to use release artifacts"
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py | 2 | ||||
| -rwxr-xr-x | kubernetes/robot/values.yaml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py index dd15e31fcb..4bcd3d93d5 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -18,7 +18,7 @@ GLOBAL_PRELOAD_PARAMETERS = { 'key_name' : 'vfw_key${uuid}', "pub_key" : "{{ .Values.vnfPubKey }}", "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw", - "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging", + "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}", "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}", "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}", "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}", diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 9daddfd00a..6ac23c09ee 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -40,7 +40,9 @@ config: # Demo configuration # Nexus demo artifact version. Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION -demoArtifactsVersion: "1.2.0-SNAPSHOT" +demoArtifactsVersion: "1.3.0" +# Nexus demo artifact URL. +demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases" # Openstack medium sized flavour name. Maps GLOBAL_INJECTED_VM_FLAVOR openStackFlavourMedium: "m1.medium" # Openstack keystone URL. Maps to GLOBAL_INJECTED_KEYSTONE @@ -66,7 +68,7 @@ ubuntu14Image: "Ubuntu_14_trusty" # Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE ubuntu16Image: "Ubuntu_16_xenial" # GLOBAL_INJECTED_SCRIPT_VERSION. Maps to GLOBAL_INJECTED_SCRIPT_VERSION -scriptVersion: "1.2.0-SNAPSHOT" +scriptVersion: "1.3.0" # Openstack network to which VNFs will bind their primary (first) interface. Maps to GLOBAL_INJECTED_NETWORK openStackPrivateNetId: "e8f51956-00dd-4425-af36-045716781ffc" # Openstack security group for instantiating VNFs |