Merge "jjb: Add job to build and deploy bt2 website"

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index f5cd3eddfd67c80999b1d28de4ba1ca85390d65b..675e74bb96f0b87976c692433d60efd6073e3a64 100644 (file)
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -37,7 +37,7 @@
           description: 'LTTng-UST git repo to checkout the UST id'
       - string:
           name: 'ROOTFS_URL'
-          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'
           description: 'The URL at which the system root FS can be downloaded'
       - string:
           name: 'LTTNG_CI_REPO'

diff --git a/scripts/babeltrace-benchmark/benchmark.py b/scripts/babeltrace-benchmark/benchmark.py
index 0c8476d0151a0d1b2573061c593d7a34877b6f42..f48a5009730a63f72a83ad45260cf26b896f3e7e 100644 (file)
--- a/scripts/babeltrace-benchmark/benchmark.py
+++ b/scripts/babeltrace-benchmark/benchmark.py
@@ -39,16 +39,57 @@ BENCHMARK_TYPES = ["dummy", "text"]
 DEFAULT_BUCKET = "lava"
 
 invalid_commits = {
-        "ec9a9794af488a9accce7708a8b0d8188b498789", # Does not build
-        "8c99128c640cbce71fb8a6caa15e4c672252b662", # Block on configure
-        "f3847c753f1b4f12353c38d97b0577d9993d19fb", # Does not build
-        "e0111295f17ddfcc33ec771a8deac505473a06ad", # Does not build
-        "d0d4e0ed487ea23aaf0d023513c0a4d86901b79b", # Does not build
-        "c24f7ab4dd9edeb5e50b0070fd9d9e8691057dde", # Does not build
-        "ce67f5614a4db3b2de4d887eca52135b439b4937", # Does not build
-        "80aff5efc66679fd934cef433c0e698694748385", # Does not build
-        "f4f11e84942d36fcc8a597d226928bce2ccac4b3", # Does not build
-        }
+    "ec9a9794af488a9accce7708a8b0d8188b498789", # Does not build
+    "8c99128c640cbce71fb8a6caa15e4c672252b662", # Block on configure
+    "f3847c753f1b4f12353c38d97b0577d9993d19fb", # Does not build
+    "e0111295f17ddfcc33ec771a8deac505473a06ad", # Does not build
+    "d0d4e0ed487ea23aaf0d023513c0a4d86901b79b", # Does not build
+    "c24f7ab4dd9edeb5e50b0070fd9d9e8691057dde", # Does not build
+    "ce67f5614a4db3b2de4d887eca52135b439b4937", # Does not build
+    "80aff5efc66679fd934cef433c0e698694748385", # Does not build
+    "f4f11e84942d36fcc8a597d226928bce2ccac4b3", # Does not build
+    "ae466a6e1b856d96cf5112a371b4df2b732503ec", # Does not build
+    "ade5c95e2a4f90f839f222fc1a66175b3b199922", # Configuration fails
+    "30341532906d62808e9d66fb115f5edb4e6f5706", # Configuration fails
+    "006c5ffb42f32e802136e3c27a63accb59b4d6c4", # Does not build
+    "88488ff5bdcd7679ff1f04fe6cff0d24b4f8fc0c", # Does not build
+    # Other errors
+    "7c7301d5827bd10ec7c34da7ffc5fe74e5047d38",
+    "a0df3abf88616cb0799f87f4eb57c54268e63448",
+    "b7045dd71bc0524ad6b5db96df365e98e237d395",
+    "cf7b259eaa602abcef308d2b5dd8e6c9ee995d8b",
+    "90a55a4ef47cac7b568f5f0a8a78bd760f82d23c",
+    "baa5e3aa82a82c9d0fa59e3c586c0168bb5dc267",
+    "af9f8da7ba4a9b16fc36d637b8c3a0c7a8774da2",
+    "fe748379adbd385efdfc7acae9c2340fb8b7d717",
+    "baa5e3aa82a82c9d0fa59e3c586c0168bb5dc267",
+    "af9f8da7ba4a9b16fc36d637b8c3a0c7a8774da2",
+    "fe748379adbd385efdfc7acae9c2340fb8b7d717",
+    "929627965e33e06dc77254d81e8ec1d66cc06590",
+    "48a0e52c4632a60cd43423f2f34f10de350bf868",
+    "b7fa35fce415b33207a9eba111069ed31ef122a0",
+    "828c8a25785e0cedaeb6987256a4dfc3c43b982f",
+    "213489680861e4d796173513effac7023312ec2d",
+    "430a5ccbbd15782501ca56bb148f3850126277ad",
+    "629d19044c43b195498d0a4e002906c54b6186d5",
+    "c423217ed1640b4152739f7e5613775d46c25050",
+    # Elfutils
+    "776a2a252c9875caa1e8b4f41cb8cc12c79611c3",
+    "435aa29aff0527d36aafa1b657ae70b9db5f9ea5",
+    "95651695473495501fc6b2c4a1cf6a78cfb3cd6a",
+    "e0748fb2ba8994c136bcc0b67d3044f09841cf8e",
+    "9e632b22e1310fe773edc32ab08a60602f4b2861",
+    "271fb6907a6f4705a1c799d925394243eae51d68",
+    "328342cd737582216dc7b8b7d558b2a1bf8ea5e8",
+    "ae5c1a4481be68fae027910b141354c1d86daa64",
+    "e6938018975e45d35dab5fef795fe7344eef7d62",
+    "e015bae2ef343b30c890eebb9182a8be13d12ed0",
+    "5e8a0751ae0c418a615025d1da10bc84f91b3d97",
+    "887d26fa0fd0ae0c5c15e4b885473c4cdc0bf078",
+    "e97fe75eac59fc39a6e4f3c4f9f3301835a0315e",
+    "8b130e7f1d6a41fb5c64a014c15246ba74b79470",
+    "f4f8f79893b18199b38edc3330093a9403c4c737",
+}
 
 def json_type(string):
     """
@@ -394,19 +435,20 @@ def launch_jobs(branches, git_path, wait_for_completion, debug, force):
     Lauch jobs for all missing results.
     """
     client = get_client()
+    commits_to_test = set()
     for branch, cutoff in branches.items():
-        commits = get_git_log(branch, cutoff, git_path)
-
+        commits = [x for x in get_git_log(branch, cutoff, git_path) if x not in invalid_commits]
         with tempfile.TemporaryDirectory() as workdir:
             for commit in commits:
-                if commit in invalid_commits:
-                    continue
                 b_results = get_benchmark_results(client, commit, workdir)[0]
                 if b_results and not force:
                     continue
-                lava_submit.submit(
-                    commit, wait_for_completion=wait_for_completion, debug=debug
-                )
+                commits_to_test.add(commit)
+    for index, commit in enumerate(commits_to_test):
+        print("Job {}/{}".format(index+1, len(commits_to_test)))
+        lava_submit.submit(
+            commit, wait_for_completion=wait_for_completion, debug=debug
+        )
 
 
 def main():

diff --git a/scripts/babeltrace-benchmark/template_lava_job_bt_benchmark.jinja2 b/scripts/babeltrace-benchmark/template_lava_job_bt_benchmark.jinja2
index e37e08e98a3de32d8fcb5897640c14d22751e581..d53c61737da5d2efbe7c9fec18461063d37cba2b 100644 (file)
--- a/scripts/babeltrace-benchmark/template_lava_job_bt_benchmark.jinja2
+++ b/scripts/babeltrace-benchmark/template_lava_job_bt_benchmark.jinja2
@@ -19,6 +19,8 @@ context:
 tags:
   - dev-sda1
 
+environment:
+  SHELL: "/bin/bash"
 
 actions:
     - deploy:

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index dc4e9b75d5fbf5405f0c10248acf39f6fde72cd9..fd5b901cedd095e1bee178077128e243baaf021f 100644 (file)
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -273,7 +273,7 @@ def LaunchJob = { jobName, jobInfo ->
   for (paramdef in job.getProperty(ParametersDefinitionProperty.class).getParameterDefinitions()) {
     // If there is a default value for this parameter, use it. Don't use empty
     // default value parameters.
-    if (paramdef.getDefaultValue()) {
+    if (paramdef.getDefaultParameterValue() != null) {
       params += paramdef.getDefaultParameterValue();
     }
   }
@@ -304,18 +304,23 @@ def recentLttngBranchesOfInterest = ['master',
   'stable-2.13',
   'stable-2.12']
 def recentLinuxBranchesOfInterest = ['master',
-  'linux-5.16.y',
+  'linux-6.1.y',
   'linux-5.15.y',
   'linux-5.10.y',
   'linux-5.4.y',
   'linux-4.19.y',
   'linux-4.14.y',
-  'linux-4.9.y']
+]
 
 def legacyLttngBranchesOfInterest = []
-def legacyLinuxBranchesOfInterest = []
-
-def vmLinuxBranchesOfInterest = ['linux-3.18.y']
+def legacyLinuxBranchesOfInterest = [
+    'linux-5.14.y',
+    'linux-4.18.y',
+    'linux-4.12.y',
+    'linux-4.9.y',
+]
+
+def vmLinuxBranchesOfInterest = []
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set