From dc859bd0c6965fe8c991330eeb14bf45db2378b6 Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Thu, 6 Dec 2018 13:33:14 -0800
Subject: [PATCH] Use 'robot' cli instead of 'pybot'

looks like pybot has been deprecated for a while and
now is officially removed.

https://github.com/robotframework/robotframework/issues/2216

Change-Id: Idbc2eeebd7e486b831e23a59b9a0b1be857ef4dc
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---
 jjb/integration/integration-apex-run-tests.sh             | 4 ++--
 jjb/integration/integration-deploy-controller-run-test.sh | 2 +-
 jjb/integration/integration-deploy-openstack-run-test.sh  | 6 +++---
 jjb/integration/integration-start-cluster-run-test.sh     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index 7b7d128fb..2b4fc1ba3 100644
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -103,7 +103,7 @@ ssh ${OPENSTACK_COMPUTE_NODE_2_IP} "sudo ovs-vsctl show"
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
-# please add pybot -v arguments on a single line and alphabetized
+# please add robot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
     # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
@@ -112,7 +112,7 @@ for suite in ${SUITES}; do
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} \
+    robot -N ${log_name} \
     -c critical -e exclude -e skip_if_${DISTROSTREAM} -e NON_GATE \
     --log log_${log_name}.html --report report_${log_name}.html --output output_${log_name}.xml \
     --removekeywords wuks \
diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 3cac8e115..b123a2f57 100755
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -48,7 +48,7 @@ done
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} \
+robot -N ${TESTPLAN} \
       --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
       -v BUNDLEFOLDER:${BUNDLEFOLDER} \
       -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6e7b798e8..6912484e3 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1116,7 +1116,7 @@ EOF
 
 source /tmp/os_netvirt_client_rc
 
-echo "Get all versions before executing pybot"
+echo "Get all versions before executing robot"
 echo "openstack --version"
 which openstack
 openstack --version
@@ -1131,7 +1131,7 @@ stacktime=$(timer $totaltmr)
 printf "Stacking elapsed time: %s\n" "${stacktime}"
 
 echo "Starting Robot test suites ${SUITES} ..."
-# please add pybot -v arguments on a single line and alphabetized
+# please add robot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
     # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
@@ -1140,7 +1140,7 @@ for suite in ${SUITES}; do
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} \
+    robot -N ${log_name} \
     -c critical -e exclude -e skip_if_${DISTROSTREAM} \
     --log log_${log_name}.html --report report_${log_name}.html --output output_${log_name}.xml \
     --removekeywords wuks \
diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index c4260c711..64b261854 100644
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -108,7 +108,7 @@ done
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} \
+robot -N ${TESTPLAN} \
       --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
       -v BUNDLEFOLDER:${BUNDLEFOLDER} \
       -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
-- 
2.36.6