From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 16 Aug 2023 17:58:26 +0000 (-0400)
Subject: jjb: lttng-ivc: move amd64 jobs to deb12
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=4ce5a709126a3e40313172ebb3143ba449198756;p=lttng-ci.git

jjb: lttng-ivc: move amd64 jobs to deb12

Change-Id: I8879305043e87517b669f60e2c30b31e5461cdc6
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/jobs/lttng-ivc.yaml b/jobs/lttng-ivc.yaml
index 62d4194..6319e0c 100644
--- a/jobs/lttng-ivc.yaml
+++ b/jobs/lttng-ivc.yaml
@@ -153,15 +153,15 @@
     jobs:
       - 'lttng-ivc-{version}':
           version: master
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           liburcu_version: !!python/tuple [master]
       - 'lttng-ivc-{version}':
           version: staging
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           liburcu_version: !!python/tuple [master]
       - 'lttng-ivc-{version}-modules':
          version: master
-         platforms: !!python/tuple [bionic-amd64]
+         platforms: !!python/tuple [deb12-amd64]
          slave: !!python/tuple [amd64-rootnode]
          liburcu_version: !!python/tuple [master]
 
diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index c008944..62069a4 100644
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2017 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 set -xu
 
 PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 # Tox does not support long path venv for whatever reason.
 PYENV_HOME=$(mktemp -d)
@@ -27,6 +26,7 @@ PYENV_HOME=$(mktemp -d)
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
 set +ux
+# shellcheck disable=SC1091
 . "$PYENV_HOME/bin/activate"
 set -ux
 
@@ -36,12 +36,16 @@ pip install --quiet tox
 TOXWORKDIR=$(mktemp -d)
 export TOXWORKDIR
 
-cd src/
+cd src/ || exit 1
+
+# Required to build tools < 2.11 with GCC >= 10
+export CFLAGS="-fcommon"
 
 # Run test suite via tox
 tox -v -- --junit-xml="${WORKSPACE}/result.xml"
 
 # Remove base venv
+deactivate
 rm -rf "$PYENV_HOME"
 
 # Save