X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust-java-tests.yaml;h=bc537002bcd3f234cef7a89be04d68912488f87b;hb=0ecb76529f15cf5935ac7179f42c1b2ecb15d6fe;hp=93de2d90a75894ee461cbe1660909b9de89c9d2c;hpb=5b3f523dfb5d1c6d0e0b25a1c0bd6665993cf500;p=lttng-ci.git

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index 93de2d9..bc53700 100644
--- a/jobs/lttng-ust-java-tests.yaml
+++ b/jobs/lttng-ust-java-tests.yaml
@@ -20,7 +20,7 @@
           browser: githubweb
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
-            - origin/{version}
+            - origin/master
           basedir: lttng-ust-java-tests
           skip-tag: true
 
@@ -29,7 +29,8 @@
 
     properties:
       - build-discarder:
-          num-to-keep: 2
+          num-to-keep: 10
+          artifact-num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -44,28 +45,12 @@
     axes:
       - axis:
          type: slave
-         name: arch
-         values: '{obj:arch}'
+         name: platform
+         values: '{obj:platforms}'
       - axis:
          type: user-defined
          name: java_version
-         values:
-           - 'java-11-openjdk'
-      - axis:
-         type: user-defined
-         name: liburcu_version
-         values:
-           - 'master'
-      - axis:
-         type: user-defined
-         name: lttng_ust_version
-         values:
-           - 'master'
-      - axis:
-         type: user-defined
-         name: lttng_tools_version
-         values:
-           - 'master'
+         values: '{obj:java_version}'
 
     wrappers:
       - workspace-cleanup
@@ -73,38 +58,40 @@
       - ansicolor
       - inject:
           properties-content: |
-            JAVA_HOME=/usr/lib/jvm/${{java_version}}-${{arch}}
+            JAVA_HOME=/usr/lib/jvm/${{java_version}}-amd64
             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
             LTTNG_SESSION_CONFIG_XSD_PATH=${{WORKSPACE}}/deps/build/share/xml/lttng
+            BABELTRACE_PLUGIN_PATH=$WORKSPACE/deps/build/lib/babeltrace2/plugins
+            LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=$WORKSPACE/deps/build/lib/babeltrace2/plugin-providers
 
     builders:
       - copyartifact:
-          project: liburcu_${{liburcu_version}}_build/arch=${{arch}},conf=std,build=std
+          project: liburcu_{liburcu_version}_build/platform=${{platform}},conf=std,build=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
           target: 'deps'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-ust_${{lttng_ust_version}}_build/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=agents,build=std
+          project: lttng-ust_{version}_build/liburcu_version={liburcu_version},platform=${{platform}},conf=agents,build=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
           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,test_type=base
+          project: lttng-tools_{version}_build/babeltrace_version={babeltrace_version},liburcu_version={liburcu_version},platform=${{platform}},conf=agents,build=std,test_type=base
           which-build: last-successful
           stable: false
           filter: 'build/**'
           target: 'deps'
           do-not-fingerprint: true
       - copyartifact:
-          project: babeltrace_{babeltrace_version}_build/arch=${{arch}},conf=std,build=std
+          project: babeltrace_{babeltrace_version}_build/platform=${{platform}},conf=std,build=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
@@ -125,7 +112,9 @@
             - common-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-common.jar
             - jul-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-jul.jar
             - log4j-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-log4j.jar
+            - log4j2-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-log4j2.jar
             - argLine=-Djava.library.path=${{WORKSPACE}}/deps/build/lib
+            - groups={groups}
       - shell:
           !include-raw-escape: scripts/lttng-ust-java-tests/stop-sessiond.sh
 
@@ -187,17 +176,24 @@
     github_name: lttng-ust-java-tests
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     email_for_all_failure: 'mathieu.desnoyers@efficios.com'
-    version:
-      - master
-    liburcu_version:
-      - master
-    lttng_ust_version:
-      - master
-    lttng_tools_version:
-      - master
     babeltrace_version: stable-2.0
     jobs:
       - 'lttng-ust-java-tests_{version}_build':
-          arch: !!python/tuple [amd64]
+          version: master
+          liburcu_version: master
+          platforms: !!python/tuple [bionic-amd64]
+          java_version: !!python/tuple [java-11-openjdk]
+          groups: '!domain:log4j2' # Remove once the log4j2 domain is merged in master
+      - 'lttng-ust-java-tests_{version}_build':
+          version: stable-2.13
+          liburcu_version: stable-0.13
+          platforms: !!python/tuple [bionic-amd64]
+          java_version: !!python/tuple [java-11-openjdk]
+          groups: '!domain:log4j2'
+      - 'lttng-ust-java-tests_{version}_build':
+          version: stable-2.12
+          liburcu_version: stable-0.13
+          platforms: !!python/tuple [bionic-amd64]
           java_version: !!python/tuple [java-11-openjdk]
+          groups: '!domain:log4j2'