X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust-java-tests.yaml;h=7f4ca4c2ff73a91e7d699f9fc10d7abf988b33c9;hb=58ebda08df1b035a0b49025f7964239e07c4201c;hp=8520ca5d4f3233806fe7b59591fd4b4c92fadb2d;hpb=ed009c24f9d19e26f707eae875f4498ba267630d;p=lttng-ci.git

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index 8520ca5..7f4ca4c 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
 
@@ -49,23 +49,7 @@
       - 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
@@ -85,21 +69,21 @@
 
     builders:
       - copyartifact:
-          project: liburcu_${{liburcu_version}}_build/arch=${{arch}},conf=std,build=std
+          project: liburcu_{liburcu_version}_build/arch=${{arch}},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},arch=${{arch}},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},arch=${{arch}},conf=agents,build=std,test_type=base
           which-build: last-successful
           stable: false
           filter: 'build/**'
@@ -127,7 +111,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
 
@@ -189,17 +175,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':
+          version: master
+          liburcu_version: master
+          arch: !!python/tuple [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
+          arch: !!python/tuple [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.12
           arch: !!python/tuple [amd64]
           java_version: !!python/tuple [java-11-openjdk]
+          groups: '!domain:log4j2'