From d9e3cd99a0da22aead99e72a0a99658e4f9f1024 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 15 Aug 2023 17:56:48 -0400
Subject: [PATCH] jjb: lttng-ust-benchmarks: move amd64 jobs to deb12

Change-Id: Ic19f735be9a72226ad1684e297252c41d349d6ba
---
 jobs/lttng-ust-benchmarks.yaml        | 18 +++++++++---------
 scripts/lttng-ust-benchmarks/build.sh |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jobs/lttng-ust-benchmarks.yaml b/jobs/lttng-ust-benchmarks.yaml
index dae347a..000df18 100644
--- a/jobs/lttng-ust-benchmarks.yaml
+++ b/jobs/lttng-ust-benchmarks.yaml
@@ -24,9 +24,9 @@
     triggers:
       - reverse:
           jobs:
-            - liburcu_master_build
-            - lttng-tools_master_build
-            - lttng-ust_master_build
+            - liburcu_master_linuxbuild
+            - lttng-tools_master_linuxbuild
+            - lttng-ust_master_linuxbuild
           result: 'success'
 
     properties:
@@ -46,32 +46,32 @@
     defaults: lttng-ust-benchmarks
 
     project-type: freestyle
-    node: bionic-amd64
+    node: deb12-amd64
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/platform=bionic-amd64,build=std,conf=std
+          project: liburcu_master_linuxbuild/platform=deb12-amd64,build=std,conf=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - copyartifact:
-          project: babeltrace_{babeltrace_version}_build/platform=bionic-amd64,build=std,conf=std
+          project: babeltrace_{babeltrace_version}_linuxbuild/platform=deb12-amd64,build=std,conf=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
           target: 'deps/babeltrace'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-tools_master_build/platform=bionic-amd64,babeltrace_version={babeltrace_version},build=std,conf=agents,liburcu_version=master
+          project: lttng-tools_master_linuxbuild/platform=deb12-amd64,babeltrace_version={babeltrace_version},build=std,conf=agents,liburcu_version=master
           which-build: last-successful
           stable: false
           filter: 'build/**'
           target: 'deps/lttng-tools'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-ust_master_build/platform=bionic-amd64,build=std,conf=std,liburcu_version=master/
+          project: lttng-ust_master_linuxbuild/platform=deb12-amd64,build=std,conf=std,liburcu_version=master/
           which-build: last-successful
           stable: false
           filter: 'build/**'
@@ -127,6 +127,6 @@
       - master
     jobs:
       - 'lttng-ust-benchmarks_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           babeltrace_version: stable-2.0
 
diff --git a/scripts/lttng-ust-benchmarks/build.sh b/scripts/lttng-ust-benchmarks/build.sh
index 635aae5..e66040c 100644
--- a/scripts/lttng-ust-benchmarks/build.sh
+++ b/scripts/lttng-ust-benchmarks/build.sh
@@ -63,8 +63,8 @@ export LTTNG_CONSUMERD64_BIN="$WORKSPACE/deps/lttng-tools/build/lib/lttng/libexe
 
 cd "$SRCDIR"
 
-make
+make PYTHON="$PYTHON3"
 
-./benchmarks.py
+"$PYTHON3" ./benchmarks.py
 
 # EOF
-- 
2.34.1