jjb: Use alternative log4j classpath on sles 15.4+

A fresh installation of SLES15SP4 doesn't have the symbolic links that
exist on ci-node-sles15sp4, eg. `/usr/share/java/log4j-1.2.jar` ->
`/usr/share/java/log4j12/log4j-12.jar`.

I suspect that the symlinks were installed manually at some point to
simplify the build scripts. As the complexity is already added to
support SLES15SP5 from fresh installations, the proper locations for
log412 can be used on SLES15SP4 as well.

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

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 6c9f03b0e848af63a52c7627d66002f18085e087..9c1a53988db1c54ee9184a736b0b08a909c8f136 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -330,7 +330,7 @@ agents)
         export JAVA_HOME="/usr/${LIBDIR_ARCH}/jvm/java-1.8.0-openjdk-1.8.0"
         export PATH="/usr/${LIBDIR_ARCH}/jvm/java-1.8.0-openjdk-1.8.0/bin:/usr/${LIBDIR_ARCH}/jvm/jre-1.8.0-openjdk/bin:${PATH}"
         SLES_VERSION="$(grep -E '</version>' /etc/products.d/SLES.prod | grep -E -o '[0-9]+\.[0-9]+')"
-        if vergte "${SLES_VERSION}" "15.5" ; then
+        if vergte "${SLES_VERSION}" "15.4" ; then
             export CLASSPATH="${DEPS_JAVA}/lttng-ust-agent-all.jar:/usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j12/log4j-12.jar"
         fi
     fi

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 68fd2da49a71ea5ff20433f7cf1851df4625f4ce..842206cc8e9b805fe68940e28f76227c189de34b 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -204,7 +204,7 @@ if [[ -f /etc/products.d/SLES.prod ]] ; then
     export PATH="/usr/${LIBDIR_ARCH}/jvm/java-1.8.0-openjdk-1.8.0/bin:/usr/${LIBDIR_ARCH}/jvm/jre-1.8.0-openjdk/bin:${PATH}"
     # Used by automake
     SLES_VERSION="$(grep -E '</version>' /etc/products.d/SLES.prod | grep -E -o '[0-9]+\.[0-9]+')"
-    if vergte "${SLES_VERSION}" "15.5" ; then
+    if vergte "${SLES_VERSION}" "15.4" ; then
         export CLASSPATH='/usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j12/log4j-12.jar'
     fi
 fi