From 1b7b4b3547c6fcf1069d93a474e1ae5559edc1b4 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 17 Aug 2023 15:42:02 -0400
Subject: [PATCH] jjb: lttng-tools: fix ust java tests on deb12

Change-Id: Ib468e32e809130ddfbd98bb484930bd3ce165398
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-tools.yaml        | 4 ++++
 scripts/lttng-tools/build.sh | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 4b656a3..3b13059 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -154,6 +154,10 @@
               ust_conf=std
               ;;
           esac
+          # Run java tests only on 'linuxbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ]; then
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
           echo "ust_conf=$ust_conf" >> env.properties
diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index d1d0d17..fbb737a 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -128,7 +128,7 @@ LTTNG_TOOLS_MAKE_CLEAN="${LTTNG_TOOLS_MAKE_CLEAN:-yes}"
 LTTNG_TOOLS_GEN_COMPILE_COMMANDS="${LTTNG_TOOLS_GEN_COMPILE_COMMANDS:-no}"
 LTTNG_TOOLS_RUN_TESTS="${LTTNG_TOOLS_RUN_TESTS:-yes}"
 LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="${LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION:-no}"
-LTTNG_TOOLS_RUN_UST_JAVA_TESTS="${LTTNG_TOOLS_RUN_UST_JAVA_TESTS:-yes}"
+LTTNG_TOOLS_RUN_UST_JAVA_TESTS="${LTTNG_TOOLS_RUN_UST_JAVA_TESTS:-no}"
 LTTNG_TOOLS_CLANG_TIDY="${LTTNG_TOOLS_CLANG_TIDY:-no}"
 
 SRCDIR="$WORKSPACE/src/lttng-tools"
@@ -538,8 +538,7 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ ! "$conf" =~ (no-ust|relayd-only)
         cd ..
     fi
 
-    if [ "$LTTNG_TOOLS_RUN_UST_JAVA_TESTS" = "yes" ] && [ "$conf" = "agents" ] && \
-           [ "$platform" = "bionic-amd64" ] && [ "$LTTNG_TOOLS_MAKE_INSTALL" = "yes" ] ; then
+    if [ "$LTTNG_TOOLS_RUN_UST_JAVA_TESTS" = "yes" ] && [ "$LTTNG_TOOLS_MAKE_INSTALL" = "yes" ] && [ "$conf" = "agents" ] ; then
         print_header "Run lttng-ust-java-tests"
         # Git Source
         LTTNG_UST_JAVA_TESTS_GIT_SOURCE="${LTTNG_UST_JAVA_TESTS_GIT_SOURCE:-https://github.com/lttng/lttng-ust-java-tests.git}"
@@ -551,7 +550,6 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ ! "$conf" =~ (no-ust|relayd-only)
         cd lttng-ust-java-tests
 
         LTTNG_UST_JAVA_TESTS_ENV=(
-            "JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/"
             PATH="${WORKSPACE}/build/bin/:$PATH"
             LD_LIBRARY_PATH="${WORKSPACE}/build/lib:$LD_LIBRARY_PATH"
             LTTNG_UST_DEBUG=1
-- 
2.34.1