X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust-java-tests.yaml;h=166032c461a0d558adcfaf7ba3ca53ca427fe906;hb=e9ba7f91e954218cd8fdaaa8e3cf8d2f6ddc80ed;hp=8e68414ae4d5e8050731be85ebb0081c47948fb5;hpb=9ffc64294c686a9f2e8b6905258cb3fd5a662003;p=lttng-ci.git

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index 8e68414..166032c 100644
--- a/jobs/lttng-ust-java-tests.yaml
+++ b/jobs/lttng-ust-java-tests.yaml
@@ -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,8 +45,8 @@
     axes:
       - axis:
          type: slave
-         name: arch
-         values: '{obj:arch}'
+         name: platform
+         values: '{obj:platforms}'
       - axis:
          type: user-defined
          name: java_version
@@ -57,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
@@ -69,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_{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_{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/**'
@@ -124,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-scm
+          matrix-notifier: only-configurations
       - email-ext:
          recipients: '{obj:email_for_all_failure}'
          always: false
@@ -145,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:
@@ -180,19 +163,19 @@
       - 'lttng-ust-java-tests_{version}_build':
           version: master
           liburcu_version: master
-          arch: !!python/tuple [amd64]
+          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
-          arch: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           java_version: !!python/tuple [java-11-openjdk]
           groups: '!domain:log4j2'
       - 'lttng-ust-java-tests_{version}_build':
-          version: stable-2.13
+          version: stable-2.12
           liburcu_version: stable-0.13
-          arch: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           java_version: !!python/tuple [java-11-openjdk]
           groups: '!domain:log4j2'