X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust-java-tests.yaml;h=375e65a81e86cd3ec09d0cfafe5efeae78de9bf2;hb=b53ef0310596bd2dc0b1e7d17024dfe8eeea2781;hp=aaaddcbccd9b2a5a96e3ef0eec2e371ff11c2cf1;hpb=4fc2788d23d8e2aaf5348a928e81dd51dbd7880a;p=lttng-ci.git

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index aaaddcb..375e65a 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,7 +58,7 @@
       - 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
@@ -85,28 +70,28 @@
 
     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
           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/**'
@@ -129,6 +114,7 @@
             - 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
 
@@ -139,6 +125,10 @@
       - junit:
           results: 'lttng-ust-java-tests/**/target/failsafe-reports/*.xml'
       - workspace-cleanup
+      - ircbot: &lttng-ust-java-tests_publisher_ircbot_defaults
+          strategy: statechange-only
+          message-type: summary
+          matrix-notifier: only-parent
       - email-ext:
          recipients: '{obj:email_for_all_failure}'
          always: false
@@ -160,28 +150,6 @@
          matrix-trigger: only-parent
          send-to:
            - recipients
-      - email-ext:
-         recipients: '{obj:email_to}'
-         reply-to: ci-notification@lists.lttng.org
-         always: false
-         unstable: false
-         first-failure: true
-         first-unstable: true
-         not-built: false
-         aborted: false
-         regression: false
-         failure: false
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
 
 ## Project
 - project:
@@ -190,17 +158,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'