Remove JClouds code

JClouds is no longer deployed in our jobs so remove our TODO items.

Change-Id: I2b93add5cbfffba7c9502f9d7ef99f011c39f5ef
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 293f23658dedca2cffc0af8fe34da66295b0f2ec..6174f8ce19610df1dd85b88a6452891b5addbe65 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -4,18 +4,10 @@ ODL_SYSTEM=()
 TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 
-# TODO: Remove condition when we no longer use JClouds plugin
-if [ -z "$JCLOUDS_IPS" ]; then
-    # If JCLOUDS_IPS is not set then we will spawn instances with
-    # OpenStack Heat.
-    source $WORKSPACE/.venv-openstack/bin/activate
-    CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-    MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-    ADDR=($CONTROLLER_IPS $MININET_IPS)
-else
-    echo "OpenStack IPS are ${JCLOUDS_IPS}"
-    IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
-fi
+source $WORKSPACE/.venv-openstack/bin/activate
+CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
+MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
+ADDR=($CONTROLLER_IPS $MININET_IPS)
 
 for i in "${ADDR[@]}"
 do

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 0fad4bf1c1b16ead99e20714f58c6687afa307e4..5436930ee7fe5d1eea1d56de0a49f97653b7fd2e 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -16,18 +16,10 @@ function copy-ssh-keys-to-slave() {
     done
 }
 
-# TODO: Remove condition when we no longer use JClouds plugin
-if [ -z "$JCLOUDS_IPS" ]; then
-    # If JCLOUDS_IPS is not set then we will spawn instances with
-    # OpenStack Heat.
-    source $WORKSPACE/.venv-openstack/bin/activate
-    CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-    MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-    ADDR=($CONTROLLER_IPS $MININET_IPS)
-else
-    echo "OpenStack IPS are ${JCLOUDS_IPS}"
-    IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
-fi
+source $WORKSPACE/.venv-openstack/bin/activate
+CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
+MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
+ADDR=($CONTROLLER_IPS $MININET_IPS)
 
 pids=""
 for i in "${ADDR[@]}"; do