Remove demo, testuite/properties repos in robot VM

No longer clone demo and testsuite/properties repos
in robot VM.  Instead, use demo repo content within
testsuite container, and pass properties directly
from heat template boot/ directory.

Change-Id: I9e472f9b6cea47dc2faebd091d95be9e89aff667
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

3 files changed, 0 insertions, 12 deletions

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index f016b0b0..3c49ea32 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -114,7 +114,6 @@ parameters:
   mr_branch: master
   policy_branch: master
   portal_branch: master
-  robot_branch: master
   sdc_branch: master
   sdnc_branch: master
   vid_branch: master
@@ -200,7 +199,6 @@ parameters:
   so_repo: http://gerrit.onap.org/r/so/docker-config.git
   policy_repo: http://gerrit.onap.org/r/policy/docker.git
   portal_repo: http://gerrit.onap.org/r/portal.git
-  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
   sdc_repo: http://gerrit.onap.org/r/sdc.git
   sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
   vid_repo: http://gerrit.onap.org/r/vid.git
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 2eaaf738..ef5af381 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -304,8 +304,6 @@ parameters:
     type: string
   portal_repo:
     type: string
-  robot_repo:
-    type: string
   sdc_repo:
     type: string
   sdnc_repo:
@@ -508,8 +506,6 @@ parameters:
     type: string
   portal_branch:
     type: string
-  robot_branch:
-    type: string
   sdc_branch:
     type: string
   sdnc_branch:
@@ -1141,7 +1137,6 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __openstack_region__: { get_param: openstack_region }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: robot_branch }
             __cloud_env__: { get_param: cloud_env }
             __keystone_url__: { get_param: keystone_url }
             __aai1_ip_addr__: { get_param: aai1_ip_addr }
@@ -1173,7 +1168,6 @@ resources:
             __public_net_id__: { get_param: public_net_id }
             __oam_network_id__: { get_resource: oam_onap }
             __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 }
@@ -1196,7 +1190,6 @@ resources:
             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
             echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
@@ -1236,7 +1229,6 @@ resources:
             echo "__oam_network_id__" > /opt/config/oam_network_id.txt
             echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
             echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
-            echo "__robot_repo__" > /opt/config/remote_repo.txt
             echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
             echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
             echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 78be0627..2232bc04 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -114,7 +114,6 @@ parameters:
   mr_branch: master
   policy_branch: master
   portal_branch: master
-  robot_branch: master
   sdc_branch: master
   sdnc_branch: master
   vid_branch: master
@@ -200,7 +199,6 @@ parameters:
   so_repo: http://gerrit.onap.org/r/so/docker-config.git
   policy_repo: http://gerrit.onap.org/r/policy/docker.git
   portal_repo: http://gerrit.onap.org/r/portal.git
-  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
   sdc_repo: http://gerrit.onap.org/r/sdc.git
   sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
   vid_repo: http://gerrit.onap.org/r/vid.git