diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-06 15:55:31 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-06-06 15:55:31 -0700 |
| commit | 87c9574f9a546f606082de6ff37bc1c3d7cad805 (patch) | |
| tree | 156dac19a114cd71db6663b497d82047cfcc84e9 | |
| parent | f7e744a719fb047deeb2ba4db5d76999e4c4088d (diff) | |
Remove hardcoded sniroemulator docker version
Change-Id: Iff34709c4f44d1e519b9dcbf9f4abbb48afcc11c
Issue-ID: INT-504
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | boot/robot_vm_init.sh | 5 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh index ca3a3f16..e306e91f 100644 --- a/boot/robot_vm_init.sh +++ b/boot/robot_vm_init.sh @@ -4,6 +4,7 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +SNIRO_DOCKER_IMAGE_VERSION=$(cat /opt/config/sniro_docker_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # @@ -48,8 +49,8 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION docker rm -f openecompete_container -docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:latest +docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION docker rm -f sniroemulator docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION -docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:latest +docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index a20afe5c..39bbc8ec 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -129,6 +129,7 @@ parameters: policy_docker: 1.2.3 portal_docker: 2.2.0 robot_docker: 1.2.1 + sniro_docker: 1.0.0 sdc_docker: 1.2.0 sdnc_docker: 1.3.4 vid_docker: 2.0.0 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 92f119ea..45b6523b 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -410,6 +410,8 @@ parameters: type: string robot_docker: type: string + sniro_docker: + type: string sdc_docker: type: string sdc_wfd_docker: @@ -1086,6 +1088,7 @@ resources: __script_version__: { get_param: artifacts_version } __robot_repo__: { get_param: robot_repo } __docker_version__: { get_param: robot_docker } + __sniro_docker_version__: { get_param: sniro_docker } __vnf_pub_key__: { get_param: pub_key } __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot } template: | @@ -1104,6 +1107,7 @@ resources: echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__keystone_url__" > /opt/config/keystone.txt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 679875f3..16c94d2a 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -129,6 +129,7 @@ parameters: policy_docker: ${POLICY_PE_DOCKER} portal_docker: ${PORTAL_APP_DOCKER} robot_docker: ${TESTSUITE_DOCKER} + sniro_docker: ${SNIROEMULATOR_DOCKER} sdc_docker: ${SDC_BACKEND_DOCKER} sdnc_docker: ${SDNC_IMAGE_DOCKER} vid_docker: ${VID_DOCKER} |