X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=6e40af06a09223dc2d3d608e14522168f96d0a1f;hb=e797d68013e210503048780208d57eca8365c176;hp=4b656a35e6be6084b0c9ae1e4d9003e53796ccf0;hpb=43eef6cbdc438450c8410fb032f3ee58f6a1aa0a;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 4b656a3..6e40af0 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -154,6 +154,10 @@
               ust_conf=std
               ;;
           esac
+          # Run java tests only on 'linuxbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ]; then
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
           echo "ust_conf=$ust_conf" >> env.properties
@@ -332,25 +336,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw32'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/lttng-tools/build.sh
-
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw64'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -618,7 +607,7 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             result: 'success'
 
 - job-template:
@@ -642,7 +631,7 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             result: 'success'
 
 - job-template:
@@ -1042,7 +1031,7 @@
 - view-template:
     name: 'LTTng-tools'
     view-type: list
-    regex: 'lttng-tools[-_].*'
+    regex: 'lttng-(docs|tools)[-_].*'
 
 
 ## Projects
@@ -1071,17 +1060,6 @@
           babelversions: !!python/tuple [stable-2.0, master]
           filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: master
-          ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [master]
-          babelversions: !!python/tuple [stable-2.0, master]
-          filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master
@@ -1130,7 +1108,7 @@
           buildtype: macosbuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1201,17 +1179,6 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.13
-          ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.13
@@ -1260,7 +1227,7 @@
           buildtype: macosbuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1321,17 +1288,6 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.12
-          ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
@@ -1380,7 +1336,7 @@
           buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1567,7 +1523,7 @@
           buildtype: macosbuild
           version: master-staging
           ustversion: master
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1690,16 +1646,6 @@
     github_user: lttng
     jobs:
     ## Master ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: master
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: master
           buildtype: linuxbuild
@@ -1744,16 +1690,6 @@
           version: master
 
     ## Stable 2.13 ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: stable-2.13
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.13
           buildtype: linuxbuild
@@ -1776,16 +1712,6 @@
           touchstone: ''
 
     ## Stable 2.12 ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: stable-2.12
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.12
           buildtype: linuxbuild