Rename LF Jenkins slaves and update impacted jobs

[releng.git] / jjb / fuel / fuel-deploy.sh

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index da08f31..14d48e7 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -34,17 +34,12 @@ BRIDGE=pxebr
 LAB_NAME=${NODE_NAME/-*}
 POD_NAME=${NODE_NAME/*-}
 
-if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then
-    LAB_NAME="lf"
-    POD_NAME="pod2"
-fi
-
 if [[ "$NODE_NAME" =~ "virtual" ]]; then
     POD_NAME="virtual_kvm"
 fi
 
-# we currently support ericsson, intel, and lf labs
-if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf) ]]; then
+# we currently support ericsson, intel, lf and zte labs
+if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf|zte) ]]; then
     echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
     exit 1
 else
@@ -95,11 +90,14 @@ if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then
     exit 0
 fi
 
+echo
 echo "SFC Scenario is deployed"
+echo
 
+# The stuff below is here temporarily and will be fixed once the release is out
 # The stuff below is here temporarily and will be fixed once the release is out
 export FUEL_MASTER_IP=10.20.0.2
-export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH##*/}"
+export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}"
 export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \
     -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \
     grep opendaylight | cut -d'|' -f5)
@@ -110,23 +108,32 @@ if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then
     exit 1
 fi
 
+echo
 echo "Copying and executing poc.tacker-up.sh script on controller node $CONTROLLER_NODE_IP"
+echo
 
 expect << END
-spawn /usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@\$env(FUEL_MASTER_IP)
+spawn /usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root $::env(FUEL_MASTER_IP)
 expect {
   -re ".*sword.*" {
     exp_send "r00tme\r"
   }
 }
 expect "# "
-send "/usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@\$env(CONTROLLER_NODE_IP)\r"
+send "/usr/bin/ssh -l root $::env(CONTROLLER_NODE_IP)\r"
 expect "# "
-send "/usr/bin/curl -o /root/poc.tacker-up.sh \$env(TACKER_SCRIPT_URL)\r"
+send "sudo apt-get install -y git\r"
 expect "# "
-send "/bin/bash /root/poc.tacker-up.sh\r"
+send "/bin/mkdir -p /root/sfc-poc && cd /root/sfc-poc\r"
 expect "# "
-send "exit\r"
+send "git clone https://gerrit.opnfv.org/gerrit/fuel && cd fuel\r"
+expect "# "
+send "git fetch https://gerrit.opnfv.org/gerrit/fuel refs/changes/97/10597/2 && git checkout FETCH_HEAD\r"
 expect "# "
+send "/bin/bash /root/sfc-poc/fuel/prototypes/sfc_tacker/poc.tacker-up.sh\r"
+expect "# "
+send "exit\r"
+expect "Connection to $::env(CONTROLLER_NODE_IP) closed. "
 send "exit\r"
+expect "Connection to $::env(FUEL_MASTER_IP) closed. "
 END