From: Kienan Stewart <kstewart@efficios.com>
Date: Tue, 19 Mar 2024 20:20:07 +0000 (-0400)
Subject: misc: Correct jenkins_job_env.py on SLES nodes
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=19562378edc1209e3128431efd4aba56024b7d16;p=lttng-ci.git

misc: Correct jenkins_job_env.py on SLES nodes

The `required` argument to `parser.add_subparser` is only introduced
in Python 3.7. SLE15SP4 has Python 3.6.

`platform.architecture` is a method that needs to be called.

Change-Id: Ie5ba39d94763701af15848d6bed66b16bede524d
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
---

diff --git a/scripts/jenkins_job_env.py b/scripts/jenkins_job_env.py
index 82401dc..0607f38 100755
--- a/scripts/jenkins_job_env.py
+++ b/scripts/jenkins_job_env.py
@@ -34,7 +34,7 @@ def _get_argparser():
         description="Fetch and create a stub environment from common job artifacts",
     )
     # Commands: fetch (implies activate), activate, deactivate
-    subparsers = parser.add_subparsers(required=True, dest="command")
+    subparsers = parser.add_subparsers(dest="command")
     parser.add_argument(
         "-v", "--verbose", action="count", help="Increase the verbosity"
     )
@@ -111,7 +111,7 @@ def fetch(destination, server, job, build, job_configuration=None, download=True
             pathlib.Path("/etc/products.d/SLES.prod").exists()
             or pathlib.Path("/etc/redhat-release").exists()
             or pathlib.Path("/etc/yocto-release").exists()
-        ) and "64bit" in platform.architecture:
+        ) and "64bit" in platform.architecture():
             lib_dir_arch = "{}64"
 
         so_re = re.compile("^.*\.so\.\d+\.\d+\.\d+$")
@@ -140,7 +140,7 @@ def create_activate(destination):
         pathlib.Path("/etc/products.d/SLES.prod").exists()
         or pathlib.Path("/etc/redhat-release").exists()
         or pathlib.Path("/etc/yocto-release").exists()
-    ) and "64bit" in platform.architecture:
+    ) and "64bit" in platform.architecture():
         lib_dir_arch = "{}64"
 
     env = {}