Rename x86 to i386 and amd64

[lttng-ci.git] / jobs / lttng-ust-java-tests.yaml

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index aea99867bc0e39942cf317cc2a04217cb81d753b..2e05c685949fb4c9286eabe524a11071846fba68 100644 (file)
--- a/jobs/lttng-ust-java-tests.yaml
+++ b/jobs/lttng-ust-java-tests.yaml
@@ -50,7 +50,7 @@
          type: user-defined
          name: java_version
          values:
-           - 'java-8-openjdk'
+           - 'java-11-openjdk'
       - axis:
          type: user-defined
          name: liburcu_version
@@ -73,14 +73,13 @@
       - ansicolor
       - inject:
           properties-content: |
+            JAVA_HOME=/usr/lib/jvm/${{java_version}}-${{arch}}
             LD_LIBRARY_PATH=${{WORKSPACE}}/deps/build/lib
             PATH=${{WORKSPACE}}/deps/build/bin:${{PATH}}
             LTTNG_UST_DEBUG=1
             LTTNG_CONSUMERD32_BIN=${{WORKSPACE}}/deps/build/lib/lttng/libexec/lttng-consumerd
             LTTNG_CONSUMERD64_BIN=${{WORKSPACE}}/deps/build/lib/lttng/libexec/lttng-consumerd
-      - env-script:
-          script-content:
-            !include-raw-escape: scripts/lttng-ust-java-tests/set-java-home.sh
+            LTTNG_SESSION_CONFIG_XSD_PATH=${{WORKSPACE}}/deps/build/share/xml/lttng
 
     builders:
       - copyartifact:
@@ -98,7 +97,7 @@
           target: 'deps'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-tools_${{lttng_tools_version}}_build/babeltrace_version={babeltrace_version},liburcu_version=${{liburcu_version}},arch=${{arch}},conf=agents,build=std
+          project: lttng-tools_${{lttng_tools_version}}_build/babeltrace_version={babeltrace_version},liburcu_version=${{liburcu_version}},arch=${{arch}},conf=agents,build=std,test_type=base
           which-build: last-successful
           stable: false
           filter: 'build/**'
@@ -199,6 +198,6 @@
     babeltrace_version: stable-1.5
     jobs:
       - 'lttng-ust-java-tests_{version}_build':
-          arch: !!python/tuple [x86-32, x86-64]
-          java_version: !!python/tuple [java-8-openjdk]
+          arch: !!python/tuple [amd64]
+          java_version: !!python/tuple [java-11-openjdk]