From 14f25f8e1866d41bf1aef086e5a3ebf2b4d3cafc Mon Sep 17 00:00:00 2001
From: Sergio Cazzolato <sergio.cazzolato@canonical.com>
Date: Thu, 3 Oct 2019 08:55:42 -0300
Subject: [PATCH] Adapt testflinger jobs to new way of calling the device ip

---
 .../console-conf-tests/job_device.sh          | 12 +++++----
 .../test_flinger/console-conf-tests/job_vm.sh | 26 ++++++++++---------
 scripts/test_flinger/snapd/job_device.sh      | 12 +++++----
 scripts/test_flinger/snapd/job_machine.sh     | 14 +++++-----
 scripts/test_flinger/snapd/job_vm.sh          | 26 ++++++++++---------
 5 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/scripts/test_flinger/console-conf-tests/job_device.sh b/scripts/test_flinger/console-conf-tests/job_device.sh
index dd8b0b1..338443e 100755
--- a/scripts/test_flinger/console-conf-tests/job_device.sh
+++ b/scripts/test_flinger/console-conf-tests/job_device.sh
@@ -10,6 +10,8 @@ else
     PROVISION_VAR="$IMAGE_URL"
 fi
 
+DEVICE_IP='$DEVICE_IP'
+
 cat > job.yaml <<EOF
 job_queue: $DEVICE_QUEUE
 provision_data:
@@ -24,12 +26,12 @@ test_data:
         git clone $CCONF_URL $PROJECT
         (cd $PROJECT && git checkout $BRANCH)
         $PRE_HOOK
-        . $PROJECT/external/prepare_ssh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER"
-        . $JOBS_PROJECT/scripts/utils/register_device.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$REGISTER_EMAIL"
-        . $JOBS_PROJECT/scripts/utils/refresh.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$CHANNEL" "$CORE_CHANNEL"
-        . $JOBS_PROJECT/scripts/utils/run_setup.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$SETUP"
+        . $PROJECT/external/prepare_ssh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER"
+        . $JOBS_PROJECT/scripts/utils/register_device.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$REGISTER_EMAIL"
+        . $JOBS_PROJECT/scripts/utils/refresh.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$CHANNEL" "$CORE_CHANNEL"
+        . $JOBS_PROJECT/scripts/utils/run_setup.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$SETUP"
         . $JOBS_PROJECT/scripts/utils/get_spread.sh
-        . $JOBS_PROJECT/scripts/utils/run_spread.sh "{device_ip}" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
+        . $JOBS_PROJECT/scripts/utils/run_spread.sh "$DEVICE_IP" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
         $POST_HOOK
 EOF
 
diff --git a/scripts/test_flinger/console-conf-tests/job_vm.sh b/scripts/test_flinger/console-conf-tests/job_vm.sh
index cf49d76..447b299 100755
--- a/scripts/test_flinger/console-conf-tests/job_vm.sh
+++ b/scripts/test_flinger/console-conf-tests/job_vm.sh
@@ -10,6 +10,8 @@ if [ -z $IMAGE_URL ]; then
     exit 1
 fi
 
+DEVICE_IP='$DEVICE_IP'
+
 cat > job.yaml <<EOF
 job_queue: $DEVICE_QUEUE
 provision_data:
@@ -17,19 +19,19 @@ provision_data:
 test_data:
     test_cmds: |
         #!/bin/bash
-        ssh $DEVICE_USER@{device_ip} "sudo apt update || ps aux | grep apt"
-        ssh $DEVICE_USER@{device_ip} "sudo apt install -y git curl jq sshpass"
-        ssh $DEVICE_USER@{device_ip} "git clone $JOBS_URL"
-        ssh $DEVICE_USER@{device_ip} "(cd $JOBS_PROJECT && git checkout $JOBS_BRANCH)"
-        ssh $DEVICE_USER@{device_ip} "git clone $CCONF_URL $PROJECT"
-        ssh $DEVICE_USER@{device_ip} "(cd $PROJECT && git checkout $BRANCH)"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo apt update || ps aux | grep apt"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo apt install -y git curl jq sshpass"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "git clone $JOBS_URL"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "(cd $JOBS_PROJECT && git checkout $JOBS_BRANCH)"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "git clone $CCONF_URL $PROJECT"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "(cd $PROJECT && git checkout $BRANCH)"
         $PRE_HOOK
-        ssh $DEVICE_USER@{device_ip} "sudo $JOBS_PROJECT/scripts/utils/create_vm.sh \"$ARCH\" \"$IMAGE_URL\" \"$USER_ASSERTION_URL\" \"./$PROJECT\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/register_device.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$REGISTER_EMAIL\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/refresh.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$CHANNEL\" \"$CORE_CHANNEL\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/run_setup.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$SETUP\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/get_spread.sh"
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/run_spread.sh \"$HOST\" \"$PORT\" \"$PROJECT\" \"$SPREAD_TESTS\" \"$SPREAD_ENV\" \"$SKIP_TESTS\" \"$SPREAD_PARAMS\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo $JOBS_PROJECT/scripts/utils/create_vm.sh \"$ARCH\" \"$IMAGE_URL\" \"$USER_ASSERTION_URL\" \"./$PROJECT\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/register_device.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$REGISTER_EMAIL\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/refresh.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$CHANNEL\" \"$CORE_CHANNEL\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/run_setup.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$SETUP\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/get_spread.sh"
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/run_spread.sh \"$HOST\" \"$PORT\" \"$PROJECT\" \"$SPREAD_TESTS\" \"$SPREAD_ENV\" \"$SKIP_TESTS\" \"$SPREAD_PARAMS\""
         $POST_HOOK
 EOF
 
diff --git a/scripts/test_flinger/snapd/job_device.sh b/scripts/test_flinger/snapd/job_device.sh
index 82fdb78..b63f36c 100755
--- a/scripts/test_flinger/snapd/job_device.sh
+++ b/scripts/test_flinger/snapd/job_device.sh
@@ -18,6 +18,8 @@ elif [ "$BRANCH" = edge ]; then
     BRANCH=$(get_edge_commit "$ARCH")
 fi
 
+DEVICE_IP='$DEVICE_IP'
+
 cat > job.yaml <<EOF
 job_queue: $DEVICE_QUEUE
 global_timeout: 36000
@@ -33,12 +35,12 @@ test_data:
         git clone $SNAPD_URL $PROJECT
         (cd $PROJECT && git checkout $BRANCH && git checkout $COMMIT)
         $PRE_HOOK
-        . $PROJECT/tests/lib/external/prepare-ssh.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER"
-        . $JOBS_PROJECT/scripts/utils/register_device.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$REGISTER_EMAIL"
-        . $JOBS_PROJECT/scripts/utils/refresh.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$CHANNEL" "$CORE_CHANNEL"
-        . $JOBS_PROJECT/scripts/utils/run_setup.sh "{device_ip}" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$SETUP"
+        . $PROJECT/tests/lib/external/prepare-ssh.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER"
+        . $JOBS_PROJECT/scripts/utils/register_device.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$REGISTER_EMAIL"
+        . $JOBS_PROJECT/scripts/utils/refresh.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$CHANNEL" "$CORE_CHANNEL"
+        . $JOBS_PROJECT/scripts/utils/run_setup.sh "$DEVICE_IP" "$DEVICE_PORT" "$TEST_USER" "$TEST_PASS" "$SETUP"
         . $JOBS_PROJECT/scripts/utils/get_spread.sh
-        . $JOBS_PROJECT/scripts/utils/run_spread.sh "{device_ip}" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
+        . $JOBS_PROJECT/scripts/utils/run_spread.sh "$DEVICE_IP" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
         $POST_HOOK
 EOF
 
diff --git a/scripts/test_flinger/snapd/job_machine.sh b/scripts/test_flinger/snapd/job_machine.sh
index 9651741..2ce1bc0 100755
--- a/scripts/test_flinger/snapd/job_machine.sh
+++ b/scripts/test_flinger/snapd/job_machine.sh
@@ -21,6 +21,8 @@ elif [ "$BRANCH" = edge ]; then
     BRANCH=$(get_edge_commit "$ARCH")
 fi
 
+DEVICE_IP='$DEVICE_IP'
+
 cat > job.yaml <<EOF
 job_queue: $DEVICE_QUEUE
 global_timeout: 36000
@@ -36,15 +38,15 @@ test_data:
         git clone $SNAPD_URL $PROJECT
         (cd $PROJECT && git checkout $BRANCH && git checkout $COMMIT)
         $PRE_HOOK
-        . $JOBS_PROJECT/scripts/utils/add_test_user.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER" "generic" "ubuntu" "$TEST_USER_TYPE"
-        . $JOBS_PROJECT/scripts/utils/run_setup.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP" || true
+        . $JOBS_PROJECT/scripts/utils/add_test_user.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER" "generic" "ubuntu" "$TEST_USER_TYPE"
+        . $JOBS_PROJECT/scripts/utils/run_setup.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP" || true
         $POST_SETUP
-        . $JOBS_PROJECT/scripts/utils/run_setup.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP_2" || true
+        . $JOBS_PROJECT/scripts/utils/run_setup.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP_2" || true
         $POST_SETUP_2
-        . $JOBS_PROJECT/scripts/utils/run_setup.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP_3" || true
-        . $JOBS_PROJECT/scripts/utils/refresh.sh "{device_ip}" "$DEVICE_PORT" "$DEVICE_USER" "" "$CHANNEL" "$CORE_CHANNEL" || true
+        . $JOBS_PROJECT/scripts/utils/run_setup.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER" "" "$SETUP_3" || true
+        . $JOBS_PROJECT/scripts/utils/refresh.sh "$DEVICE_IP" "$DEVICE_PORT" "$DEVICE_USER" "" "$CHANNEL" "$CORE_CHANNEL" || true
         . $JOBS_PROJECT/scripts/utils/get_spread.sh
-        . $JOBS_PROJECT/scripts/utils/run_spread.sh "{device_ip}" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
+        . $JOBS_PROJECT/scripts/utils/run_spread.sh "$DEVICE_IP" "$DEVICE_PORT" "$PROJECT" "$SPREAD_TESTS" "$SPREAD_ENV" "$SKIP_TESTS" "$SPREAD_PARAMS"
         $POST_HOOK
 EOF
 
diff --git a/scripts/test_flinger/snapd/job_vm.sh b/scripts/test_flinger/snapd/job_vm.sh
index ae677e3..4f87677 100755
--- a/scripts/test_flinger/snapd/job_vm.sh
+++ b/scripts/test_flinger/snapd/job_vm.sh
@@ -18,6 +18,8 @@ elif [ "$BRANCH" = edge ]; then
     BRANCH=$(get_edge_commit "$ARCH")
 fi
 
+DEVICE_IP='$DEVICE_IP'
+
 cat > job.yaml <<EOF
 job_queue: $DEVICE_QUEUE
 provision_data:
@@ -25,19 +27,19 @@ provision_data:
 test_data:
     test_cmds: |
         #!/bin/bash
-        ssh $DEVICE_USER@{device_ip} "sudo apt update || ps aux | grep apt"
-        ssh $DEVICE_USER@{device_ip} "sudo apt install -y git curl jq sshpass"
-        ssh $DEVICE_USER@{device_ip} "git clone $JOBS_URL"
-        ssh $DEVICE_USER@{device_ip} "(cd $JOBS_PROJECT && git checkout $JOBS_BRANCH)"
-        ssh $DEVICE_USER@{device_ip} "git clone $SNAPD_URL $PROJECT"
-        ssh $DEVICE_USER@{device_ip} "(cd $PROJECT && git checkout $BRANCH && git checkout $COMMIT)"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo apt update || ps aux | grep apt"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo apt install -y git curl jq sshpass"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "git clone $JOBS_URL"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "(cd $JOBS_PROJECT && git checkout $JOBS_BRANCH)"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "git clone $SNAPD_URL $PROJECT"
+        ssh ${DEVICE_USER}@${DEVICE_IP} "(cd $PROJECT && git checkout $BRANCH && git checkout $COMMIT)"
         $PRE_HOOK
-        ssh $DEVICE_USER@{device_ip} "sudo $JOBS_PROJECT/scripts/utils/create_vm.sh \"$ARCH\" \"$IMAGE_URL\" \"$USER_ASSERTION_URL\" \"./$PROJECT\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/register_device.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$REGISTER_EMAIL\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/refresh.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$CHANNEL\" \"$CORE_CHANNEL\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/run_setup.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$SETUP\""
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/get_spread.sh"
-        ssh $DEVICE_USER@{device_ip} ". $JOBS_PROJECT/scripts/utils/run_spread.sh \"$HOST\" \"$PORT\" \"$PROJECT\" \"$SPREAD_TESTS\" \"$SPREAD_ENV\" \"$SKIP_TESTS\" \"$SPREAD_PARAMS\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} "sudo $JOBS_PROJECT/scripts/utils/create_vm.sh \"$ARCH\" \"$IMAGE_URL\" \"$USER_ASSERTION_URL\" \"./$PROJECT\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/register_device.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$REGISTER_EMAIL\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/refresh.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$CHANNEL\" \"$CORE_CHANNEL\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/run_setup.sh \"$HOST\" \"$PORT\" \"$TEST_USER\" \"$TEST_PASS\" \"$SETUP\""
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/get_spread.sh"
+        ssh ${DEVICE_USER}@${DEVICE_IP} ". $JOBS_PROJECT/scripts/utils/run_spread.sh \"$HOST\" \"$PORT\" \"$PROJECT\" \"$SPREAD_TESTS\" \"$SPREAD_ENV\" \"$SKIP_TESTS\" \"$SPREAD_PARAMS\""
         $POST_HOOK
 EOF