From 13f99c1cfa2a775d548e6515046b381162256c74 Mon Sep 17 00:00:00 2001
From: Steven Fitzpatrick <steven.fitzpatrick@att.com>
Date: Thu, 17 Oct 2019 09:11:02 -0500
Subject: [PATCH] Update Zuul Selenium to use Python3

This change updates the deploy-selenium playbook
to install Selenium using pip 3.

The shell scripts which call our selenium test python
files have been updated to use python 3.

Change-Id: I7fc82ecd830d460639c718614ce1cca9fd4d1953
---
 roles/deploy-selenium/tasks/main.yaml          | 1 +
 tools/deployment/common/grafana-selenium.sh    | 2 +-
 tools/deployment/common/kibana-selenium.sh     | 2 +-
 tools/deployment/common/nagios-selenium.sh     | 2 +-
 tools/deployment/common/prometheus-selenium.sh | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/roles/deploy-selenium/tasks/main.yaml b/roles/deploy-selenium/tasks/main.yaml
index e20ffc5a04..e158bacb5e 100644
--- a/roles/deploy-selenium/tasks/main.yaml
+++ b/roles/deploy-selenium/tasks/main.yaml
@@ -31,6 +31,7 @@
   pip:
     name: selenium
     state: latest
+    executable: pip3
 
 - name: Get selenium chrome driver
   shell: |-
diff --git a/tools/deployment/common/grafana-selenium.sh b/tools/deployment/common/grafana-selenium.sh
index 7f89711412..e5d6004c64 100755
--- a/tools/deployment/common/grafana-selenium.sh
+++ b/tools/deployment/common/grafana-selenium.sh
@@ -9,4 +9,4 @@ export GRAFANA_USER="admin"
 export GRAFANA_PASSWORD="password"
 export GRAFANA_URI="grafana.osh-infra.svc.cluster.local"
 
-python tools/gate/selenium/grafanaSelenium.py
+python3 tools/gate/selenium/grafanaSelenium.py
diff --git a/tools/deployment/common/kibana-selenium.sh b/tools/deployment/common/kibana-selenium.sh
index eae9c81ae3..140f1f9f5a 100755
--- a/tools/deployment/common/kibana-selenium.sh
+++ b/tools/deployment/common/kibana-selenium.sh
@@ -13,4 +13,4 @@ export KERNEL_QUERY="discover?_g=()&_a=(columns:!(_source),index:'kernel-*',inte
 export JOURNAL_QUERY="discover?_g=()&_a=(columns:!(_source),index:'journal-*',interval:auto,query:(match_all:()),sort:!('@timestamp',desc))"
 export LOGSTASH_QUERY="discover?_g=()&_a=(columns:!(_source),index:'logstash-*',interval:auto,query:(match_all:()),sort:!('@timestamp',desc))"
 
-python tools/gate/selenium/kibanaSelenium.py
+python3 tools/gate/selenium/kibanaSelenium.py
diff --git a/tools/deployment/common/nagios-selenium.sh b/tools/deployment/common/nagios-selenium.sh
index 638e5b941a..6b2d2f7c2a 100755
--- a/tools/deployment/common/nagios-selenium.sh
+++ b/tools/deployment/common/nagios-selenium.sh
@@ -9,4 +9,4 @@ export NAGIOS_USER="nagiosadmin"
 export NAGIOS_PASSWORD="password"
 export NAGIOS_URI="nagios.osh-infra.svc.cluster.local"
 
-python tools/gate/selenium/nagiosSelenium.py
+python3 tools/gate/selenium/nagiosSelenium.py
diff --git a/tools/deployment/common/prometheus-selenium.sh b/tools/deployment/common/prometheus-selenium.sh
index eb0ad77993..10bb877205 100755
--- a/tools/deployment/common/prometheus-selenium.sh
+++ b/tools/deployment/common/prometheus-selenium.sh
@@ -9,4 +9,4 @@ export PROMETHEUS_USER="admin"
 export PROMETHEUS_PASSWORD="changeme"
 export PROMETHEUS_URI="prometheus.osh-infra.svc.cluster.local"
 
-python tools/gate/selenium/prometheusSelenium.py
+python3 tools/gate/selenium/prometheusSelenium.py