X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust-java-tests.yaml;h=2e05c685949fb4c9286eabe524a11071846fba68;hb=20defd5e328ab5a054111f3657ebc0323a3a2f7f;hp=7aa67ca22f754880dbbe57b7006e46486926eaad;hpb=e0fd33ddea67decee67c619e68fc2263d3f52754;p=lttng-ci.git

diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml
index 7aa67ca..2e05c68 100644
--- 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/**'
@@ -114,11 +113,11 @@
       - shell:
           !include-raw-escape: scripts/lttng-ust-java-tests/start-sessiond.sh
       - maven-target:
-          maven-version: "Maven 3.3.9"
+          maven-version: "default"
           goals: "-version"
           private-repository: true
       - maven-target:
-          maven-version: "Maven 3.3.9"
+          maven-version: "default"
           goals: clean verify
           pom: 'lttng-ust-java-tests/pom.xml'
           properties:
@@ -131,24 +130,63 @@
           !include-raw-escape: scripts/lttng-ust-java-tests/stop-sessiond.sh
 
     publishers:
+      - archive:
+          artifacts: 'lttng-sessiond.log'
+          allow-empty: false
       - junit:
           results: 'lttng-ust-java-tests/**/target/failsafe-reports/*.xml'
       - workspace-cleanup
       - email-ext:
-          recipients: alex@voxpopuli.im
-          matrix-trigger: only-parent
-      - ircbot:
-          strategy: new-failure-and-fixed
-          matrix-notifier: only-parent
-          channels:
-            - name: '#lttng'
-
+         recipients: '{obj:email_for_all_failure}'
+         always: false
+         unstable: true
+         first-failure: false
+         first-unstable: false
+         not-built: false
+         aborted: false
+         regression: false
+         failure: true
+         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
+      - 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:
     name: lttng-ust-java-tests
     github_user: lttng
     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:
@@ -160,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]