From 6f5a3a3fa6b4a4cb55bdccc0792cb7902356a853 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 19 Jul 2023 15:21:34 -0400
Subject: [PATCH] jjb: lttng-tools: remove proc-cleaner from macosbuild jobs

Macos runs a lot of user processes which the proc-cleaner plugin tries
to kill, don't use it on macosbuild jobs.

Change-Id: I84a21cb3ee4b72223de9e157f6e336d25c8faada
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-tools.yaml | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index de69407..0931f9c 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -548,6 +548,20 @@
     <<: *lttng-tools_builders_defaults
     <<: *lttng-tools_publishers_defaults
 
+- job-template:
+    name: 'dev_{user}_lttng-tools_{version}_macosbuild'
+    defaults: lttng-tools
+
+    wrappers:
+      - ansicolor: *lttng-tools_wrapper_ansicolor_defaults
+      - timeout: *lttng-tools_wrapper_timeout_defaults
+      - timestamps
+      - workspace-cleanup
+
+    <<: *lttng-tools_matrix_axes_defaults
+    <<: *lttng-tools_builders_defaults
+    <<: *lttng-tools_publishers_defaults
+
 - job-template:
     name: '{job_prefix}lttng-tools_{version}_long_regression'
     defaults: lttng-tools
@@ -627,6 +641,20 @@
             jobs: '{ust_job_prefix}lttng-ust_{version}_build'
             result: 'success'
 
+- job-template:
+    name: '{job_prefix}lttng-tools_{version}_macosbuild'
+    defaults: lttng-tools
+
+    wrappers:
+      - ansicolor: *lttng-tools_wrapper_ansicolor_defaults
+      - timeout: *lttng-tools_wrapper_timeout_defaults
+      - timestamps
+      - workspace-cleanup
+
+    <<: *lttng-tools_matrix_axes_defaults
+    <<: *lttng-tools_builders_defaults
+    <<: *lttng-tools_publishers_defaults
+
 - job-template:
     name: lttng-tools_{version}_winbuild
     defaults: lttng-tools
@@ -1093,7 +1121,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: master
           ustversion: master
@@ -1223,7 +1251,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: stable-2.13
           ustversion: stable-2.13
@@ -1343,7 +1371,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
@@ -1530,7 +1558,7 @@
           babelversions: !!python/tuple [stable-1.5, master]
           filter: ''
           touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+      - 'dev_{user}_lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: master-staging
           ustversion: master
-- 
2.34.1