From 5e79a3e048d695c8c455c5533d3cd31fb0f9bcfc Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Wed, 24 May 2023 08:49:32 -0400
Subject: [PATCH] lava: Switch default lava-server to lava-master-03

Change-Id: I5307a909c8d65e0d649c2a574fc46dbf172f8f2e
---
 jobs/system-tests.yaml                      | 2 +-
 lava/deploy_devices_dict.sh                 | 2 +-
 scripts/babeltrace-benchmark/lava_submit.py | 8 ++++----
 scripts/system-tests/lava2-submit.py        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 3741141..f5cd3ed 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -49,7 +49,7 @@
           description: 'The branch of the CI repository to clone for job scripts'
       - string:
           name: 'LAVA_HOST'
-          default: 'lava-master-02.internal.efficios.com'
+          default: 'lava-master-03.internal.efficios.com'
           description: 'The hostname of the LAVA instance'
       - choice:
           name: 'LAVA_PROTO'
diff --git a/lava/deploy_devices_dict.sh b/lava/deploy_devices_dict.sh
index ed95759..a778a2e 100755
--- a/lava/deploy_devices_dict.sh
+++ b/lava/deploy_devices_dict.sh
@@ -17,4 +17,4 @@
 
 # Simple deployment of lava device dictionaries
 
-ssh -t -l lava lava-master-02.internal.efficios.com 'sudo ln -s /home/lava/lttng-ci/lava/devices/* /etc/lava-server/dispatcher-config/devices/'
+ssh -t -l lavaserver lava-master-03.internal.efficios.com 'sudo ln -s /var/lib/lava-server/home/lttng-ci/lava/devices/* /etc/lava-server/dispatcher-config/devices/'
diff --git a/scripts/babeltrace-benchmark/lava_submit.py b/scripts/babeltrace-benchmark/lava_submit.py
index 8536b03..c4b4314 100644
--- a/scripts/babeltrace-benchmark/lava_submit.py
+++ b/scripts/babeltrace-benchmark/lava_submit.py
@@ -23,7 +23,7 @@ import xmlrpc.client
 from jinja2 import Environment, FileSystemLoader
 
 USERNAME = "lava-jenkins"
-HOSTNAME = "lava-master-02.internal.efficios.com"
+HOSTNAME = "lava-master-03.internal.efficios.com"
 DEFAULT_KERNEL_COMMIT = "a227f8436f2b21146fc024d84e6875907475ace2"
 
 
@@ -93,7 +93,7 @@ def submit(
         return 0
 
     server = xmlrpc.client.ServerProxy(
-        "http://%s:%s@%s/RPC2" % (USERNAME, lava_api_key, HOSTNAME)
+        "https://%s:%s@%s/RPC2" % (USERNAME, lava_api_key, HOSTNAME)
     )
 
     for attempt in range(10):
@@ -113,8 +113,8 @@ def submit(
 
     print("Lava jobid:{}".format(jobid), flush=True)
     print(
-        "Lava job URL: http://lava-master-02.internal.efficios.com/scheduler/job/{}".format(
-            jobid
+        "Lava job URL: https://{}/scheduler/job/{}".format(
+            HOSTNAME, jobid
         ),
         flush=True,
     )
diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 8ff4c55..e6b4ea2 100644
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -28,8 +28,8 @@ import yaml
 from jinja2 import Environment, FileSystemLoader
 
 USERNAME = 'lava-jenkins'
-HOSTNAME = os.environ.get('LAVA_HOST', 'lava-master-02.internal.efficios.com')
-PROTO = os.environ.get('LAVA_PROTO', 'http')
+HOSTNAME = os.environ.get('LAVA_HOST', 'lava-master-03.internal.efficios.com')
+PROTO = os.environ.get('LAVA_PROTO', 'https')
 OBJSTORE_URL = "https://obj.internal.efficios.com/lava/results/"
 
 def parse_stable_version(stable_version_string):
-- 
2.34.1