Merge "ansible/lava: Add role for lava server"

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 32298e57b64d842fa6194cbdb202c0a85aadd39e..f5cd3eddfd67c80999b1d28de4ba1ca85390d65b 100644 (file)
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -47,6 +47,16 @@
           name: 'LTTNG_CI_BRANCH'
           default: 'master'
           description: 'The branch of the CI repository to clone for job scripts'
+      - string:
+          name: 'LAVA_HOST'
+          default: 'lava-master-03.internal.efficios.com'
+          description: 'The hostname of the LAVA instance'
+      - choice:
+          name: 'LAVA_PROTO'
+          choices:
+            - 'http'
+            - 'https'
+          description: 'The protocol to use with the LAVA host'
 
 - publisher:
     name: 'system_tests_email_ext_default'
@@ -108,6 +118,8 @@
             LTTNG_VERSION={lttngversion}
             LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
             LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
+            LAVA_HOST=${{LAVA_HOST}}
+            LAVA_PROTO=${{LAVA_PROTO}}
 
     scm:
       - git:
@@ -186,7 +198,8 @@
             LTTNG_VERSION={lttngversion}
             LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
             LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
-
+            LAVA_HOST=${{LAVA_HOST}}
+            LAVA_PROTO=${{LAVA_PROTO}}
     scm:
       - git:
           url: "${{LTTNG_CI_REPO}}"

diff --git a/lava/deploy_devices_dict.sh b/lava/deploy_devices_dict.sh
index ed95759c3b404df758cd689cb46e80a0e9875b96..a778a2eba5f43ed2ccbf30c3f3707b81a20b838b 100755 (executable)
--- 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 8536b035eae3bb544f30e36718d81d8df7287abc..c4b43141263693f25444149f3daf1a13fab35948 100644 (file)
--- 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/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index ea70b3cdf4617f770941547311aff284e96e82f2..ee660a686623c67cff36677cd4bd3e8d5302cb10 100644 (file)
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -29,6 +29,9 @@ secret_key = echo123456
 # Enable S3 v4 signature APIs
 signature_v2 = False" > "$WORKSPACE/s3cfg"
 
+echo "LAVA_HOST=$LAVA_HOST" >> properties.txt
+echo "LAVA_PROTO=$LAVA_PROTO" >> properties.txt
+
 LTTNG_CI_PATH="$WORKSPACE/src/lttng-ci"
 echo "LTTNG_CI_PATH=$LTTNG_CI_PATH" >> properties.txt
 echo "LTTNG_CI_REPO=$LTTNG_CI_REPO" >> properties.txt

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 1dbea2cebe03540b2d2d9dd3a7e12abfb20fcd58..e6b4ea2d5e9931947135c4400d02765447c9948e 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -28,7 +28,8 @@ import yaml
 from jinja2 import Environment, FileSystemLoader
 
 USERNAME = 'lava-jenkins'
-HOSTNAME = 'lava-master-02.internal.efficios.com'
+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):
@@ -89,8 +90,8 @@ def check_job_all_test_cases_state_count(server, job):
     for testcase in testcases:
         if testcase['result'] != 'pass':
             print(
-                "\tFAILED {}\n\t\t See http://{}{}".format(
-                    testcase['name'], HOSTNAME, testcase['url']
+                "\tFAILED {}\n\t\t See {}://{}{}".format(
+                    testcase['name'], PROTO, HOSTNAME, testcase['url']
                 )
             )
             failed_tests += 1
@@ -197,7 +198,7 @@ def main():
     parser.add_argument('-d', '--debug', required=False, action='store_true')
     parser.add_argument(
         '-r', '--rootfs-url', required=False,
-        default="https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz"
+        default="https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_jammy_2023-05-18.tar.gz"
     )
     parser.add_argument('--ci-repo', required=False, default='https://github.com/lttng/lttng-ci.git')
     parser.add_argument('--ci-branch', required=False, default='master')
@@ -280,7 +281,7 @@ def main():
         return 0
 
     server = xmlrpc.client.ServerProxy(
-        'http://%s:%s@%s/RPC2' % (USERNAME, lava_api_key, HOSTNAME)
+        '%s://%s:%s@%s/RPC2' % (PROTO, USERNAME, lava_api_key, HOSTNAME)
     )
 
     for attempt in range(1, send_retry_limit + 1):
@@ -307,8 +308,8 @@ def main():
 
     print('Lava jobid:{}'.format(jobid))
     print(
-        'Lava job URL: http://lava-master-02.internal.efficios.com/scheduler/job/{}'.format(
-            jobid
+        'Lava job URL: {}://{}/scheduler/job/{}'.format(
+            PROTO, HOSTNAME, jobid
         )
     )
 

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 59fc91f0da701270926a53c3ae39c6227c8fb129..5aaece84c9fc07eae4617f2e2cee6029a4504170 100644 (file)
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -16,6 +16,9 @@ context:
   extra_kernel_args: cpuidle.off=1
   extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
 
+environment:
+  SHELL: "/bin/bash"
+
 {% if device_type == DeviceType.kvm %}
 tags:
   - qemu