X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=ee35d1da414dc38a447f05893f701635fa05615f;hb=217fb82a1eff7c9fb799b059eafa25b895a8e770;hp=bad0265b3af46fc39bca212b1d14c6f7c72e5fc0;hpb=5719040c2a9caf160a7f8458befa4f7e0e89bc36;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index bad0265..ee35d1d 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -321,7 +321,6 @@
       - archive: *lttng-ust_publisher_archive_defaults
       - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
 
-
 ## Templates
 - job-template:
     name: '{job_prefix}lttng-ust_{version}_{buildtype}'
@@ -467,6 +466,66 @@
       - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
       - ircbot: *lttng-ust_publisher_ircbot_defaults
 
+- job-template:
+    name: dev_review_lttng-ust-java-tests_{version}_{buildtype}
+    defaults: lttng-ust
+    description: |
+      Review tests for LTTng-UST's Java agent.
+      <p>Job is managed by Jenkins Job Builder.</p>
+    project-type: matrix
+    axes:
+      - axis:
+          <<: *lttng-ust_matrix_axis_platform
+    concurrent: true
+    scm:
+      - git:
+          url: https://review.lttng.org/lttng-ust-java-tests
+          refspec: 'refs/changes/*:refs/changes/*'
+          branches:
+            - '$GERRIT_REFSPEC'
+          basedir: 'src/lttng-ust-java-tests'
+          skip-tag: true
+    triggers:
+      - gerrit:
+          <<: *lttng-ust_trigger_gerrit_defaults
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'lttng-ust-java-tests'
+              branches:
+                - branch-compare-type: 'PLAIN'
+                  branch-pattern: '{version}'
+    builders:
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'liburcu_{liburcu_versions[0]}_{buildtype}/platform=${{platform}},conf=std,build=std'
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'lttng-ust_{lttngust_versions[0]}_{buildtype}/liburcu_version={liburcu_versions[0]},platform=${{platform}},conf=agents,build=std'
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'lttng-tools_{lttngtools_versions[0]}_{buildtype}/babeltrace_version={babeltrace_versions[0]},liburcu_version={liburcu_versions[0]},platform=${{platform}},conf=agents,build=std'
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'babeltrace_{babeltrace_versions[0]}_{buildtype}/platform=${{platform}},conf=std,build=std'
+      - shell:
+          !include-raw-escape scripts/lttng-ust/lttng-ust-java-tests.sh
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-ust-java-tests
+      - build-discarder:
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit-{buildtype}'
+    publishers:
+      - archive:
+          artifacts: 'log/lttng-sessiond.log'
+          allow-empty: false
+      - junit:
+          results: 'src/lttng-ust-java-tests/**/target/failsafe-reports/*.xml'
+      - workspace-cleanup
 
 ## Views
 - view-template:
@@ -505,10 +564,10 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: master
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
@@ -523,7 +582,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: yoctobuild
           version: master
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -565,7 +624,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.13
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -583,7 +642,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: yoctobuild
           version: stable-2.13
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -614,7 +673,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.12
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.13]
@@ -632,7 +691,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: yoctobuild
           version: stable-2.12
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.13]
@@ -641,98 +700,13 @@
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.12
 
-
-- project:
-    name: lttng-ust-dev-upstream
-    job_prefix: dev_upstream_
-    github_user: lttng
-    github_name: lttng-ust
-    email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
-    jobs:
-      ## Stable 2.11 ##
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.11
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, dist, oot, oot-dist]
-          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_versions: !!python/tuple [stable-0.11]
-          filter: '(build=="std") || (conf=="std" || conf=="agents")'
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.11
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.11]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.11
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.11]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.11
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          liburcu_versions: !!python/tuple [stable-0.11]
-          filter: ''
-          touchstone: ''
-
-      ## Stable 2.10 ##
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.10
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, dist, oot, oot-dist]
-          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_versions: !!python/tuple [stable-0.9]
-          filter: '(build=="std") || (conf=="std" || conf=="agents")'
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.10
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.9]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.10
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.9]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.10
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          liburcu_versions: !!python/tuple [stable-0.9]
-          filter: ''
-          touchstone: ''
-
-
 - project:
     name: review-lttng-ust
     job_prefix: ''
     github_user: lttng
     github_name: lttng-ust
     jobs:
-    ## master ##
+      ## master ##
       - 'dev_review_lttng-ust_{version}_{buildtype}':
           version: master
           buildtype: linuxbuild
@@ -752,6 +726,16 @@
           touchstone: ''
           liburcu_version: stable-0.14
           babeltrace_version: stable-2.0
+      - 'dev_review_lttng-ust_lttng-tools_{version}_{buildtype}':
+          version: master
+          buildtype: slesbuild
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          filter: ''
+          touchstone: ''
+          liburcu_version: stable-0.14
+          babeltrace_version: stable-2.0
       - 'dev_review_lttng-ust_{version}_{buildtype}':
           version: master
           buildtype: portbuild
@@ -832,23 +816,29 @@
           touchstone: '(platform == "deb12-i386")'
 
 - project:
-    name: lttng-ust-mjeanson
-    job_prefix: 'dev_mjeanson_'
+    name: review-lttng-ust-java
+    job_prefix: ''
     github_user: lttng
-    github_name: lttng-ust
-    email_to: "mjeanson@efficios.com"
-    version:
-      - master
+    github_name: lttng-ust-java-tests
+    #
+    filter: ''
+    groups: '!domain:log4j2'
+    java_versions: !!python/tuple [java-11-openjdk]
+    touchstone: ''
+    version: master
+    #
+    babeltrace_versions: !!python/tuple [stable-2.0]
+    liburcu_versions: !!python/tuple [master]
+    lttngtools_versions: !!python/tuple [master]
+    lttngust_versions: !!python/tuple [master]
+    #
     jobs:
-      - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: portbuild
-          version: master
-          platforms: !!python/tuple [sid-riscv64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, agents]
-          liburcu_versions: !!python/tuple [master]
-          filter: ''
-          touchstone: ''
+      - 'dev_review_lttng-ust-java-tests_{version}_{buildtype}':
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
+      - 'dev_review_lttng-ust-java-tests_{version}_{buildtype}':
+          buildtype: slesbuild
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
 
 - project:
     name: lttng-ust-views