X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=5ad412e044010e7aa7b4ad3d36123730329a52b7;hb=5a9325931a004f9c69427f698ccaa1f82b64419d;hp=3fa5bfb4088e4c28d8723e1e57c23590672a94c0;hpb=ac6fcfec59ba28368069d7df943b8040a479b5f8;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 3fa5bfb..5ad412e 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -157,6 +157,8 @@
           # Run java tests only on 'linuxbuild' jobs
           if [ "{buildtype}" = "linuxbuild" ]; then
             echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          else
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=no" >> env.properties
           fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
@@ -336,25 +338,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
@@ -684,9 +671,6 @@
             - '$GERRIT_REFSPEC'
           basedir: src/lttng-tools
           skip-tag: true
-          # Work-around for hangs while cloning lttng-tools from gerrit
-          # @see https://support.efficios.com/issues/1532
-          git-tool: jgit
 
     triggers:
       - gerrit: &lttng-tools_trigger_gerrit_default
@@ -1049,7 +1033,7 @@
 - view-template:
     name: 'LTTng-tools'
     view-type: list
-    regex: 'lttng-tools[-_].*'
+    regex: 'lttng-(docs|tools)[-_].*'
 
 
 ## Projects
@@ -1126,7 +1110,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]
@@ -1245,7 +1229,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]
@@ -1354,7 +1338,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]
@@ -1403,107 +1387,6 @@
           urcuversion: stable-0.13
           ustversion: stable-2.12
 
-- project:
-    name: dev_upstream_lttng-tools
-    job_prefix: 'dev_upstream_'
-    ust_job_prefix: 'dev_upstream_'
-    urcu_job_prefix: 'dev_upstream_'
-    bt_job_prefix: 'dev_upstream_'
-    github_user: lttng
-    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
-    jobs:
-      # stable-2.11
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: '(build=="std") || (conf=="std" || conf=="agents" || conf=="no-ust")'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
-      # stable-2.10
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: '(build=="std") || (conf=="std" || conf=="agents" || conf=="no-ust")'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
 - project:
     name: dev_jgalar_lttng-tools
     job_prefix: 'dev_jgalar_'
@@ -1541,7 +1424,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]
@@ -1597,64 +1480,6 @@
           filter: ''
           touchstone: ''
 
-- project:
-    name: dev_jgalar_lttng-tools-upstream
-    job_prefix: 'dev_jgalar_'
-    ust_job_prefix: 'dev_upstream_'
-    urcu_job_prefix: 'dev_upstream_'
-    bt_job_prefix: 'dev_upstream_'
-    user: jgalar
-    github_user: jgalar
-    email_to: 'jgalar@efficios.com'
-    jobs:
-      # stable-2.11
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.11-staging
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.11-staging
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
-      # stable-2.10
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.10-staging
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.10-staging
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
 - project:
     name: review-lttng-tools
     job_prefix: ''
@@ -1751,41 +1576,6 @@
           filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")'
           touchstone: ''
 
-- project:
-    name: lttng-tools-mjeanson
-    job_prefix: 'dev_mjeanson_'
-    ust_job_prefix: 'dev_mjeanson_'
-    urcu_job_prefix: 'dev_mjeanson_'
-    bt_job_prefix: 'dev_mjeanson_'
-    github_user: lttng
-    github_name: lttng-tools
-    email_to: "mjeanson@efficios.com"
-    version:
-      - master
-    jobs:
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: master
-          ustversion: master
-          platforms: !!python/tuple [sid-riscv64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [master]
-          babelversions: !!python/tuple [master]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_rootbuild':
-          version: master
-          buildtype: linuxbuild
-          ustversion: master
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [master]
-          ustversion: master
-          babelversions: !!python/tuple [master]
-          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
-          touchstone: ''
 
 - project:
     name: lttng-tools-views