jjb: lttbg-ust: cleanup yaml job definition

Replace duplications with yaml anchors, replace deprecated Warnings
plugin with Warnings-NG, cleanup unused portions of build scripts.

Change-Id: Ibac8ed5c5d65691f0b1c731010d0e953d7d62d44
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 7980737230cf42b155ff15e7df51f7f50cc0fa85..4c17b7ee5cf2b2f4936bc72de8bfc6d7d33c3519 100644 (file)
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -11,9 +11,15 @@
     project-type: freestyle
 
     wrappers:
-      - workspace-cleanup
+      - ansicolor: &lttng-ust_wrapper_ansicolor_defaults
+          colormap: xterm
+      - timeout: &lttng-ust_wrapper_timeout_defaults
+          timeout: 20
+          fail: true
+          type: no-activity
+          write-description: "<h1 style=\"color:red\">This build failed due to timeout.</h1>"
       - timestamps
-      - ansicolor
+      - workspace-cleanup
 
     scm:
       - git:
@@ -40,205 +46,209 @@
 
 
 ## Anchors
-- lttng-ust_build_axes_defaults: &lttng-ust_build_axes_defaults
-    name: 'lttng-ust_build_axes_defaults'
+- lttng-ust_matrix_axes_defaults: &lttng-ust_matrix_axes_defaults
+    name: 'lttng-ust_matrix_axes_defaults'
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
-    execution-strategy:
+    execution-strategy: &lttng-ust_matrix_execution-strategy_defaults
       combination-filter: '{filter}'
+      touchstone:
+        expr: '{touchstone}'
+        result: unstable
     axes:
-      - axis:
+      - axis: &lttng-ust_matrix_axis_arch
          type: slave
          name: arch
-         values: '{obj:arch}'
-      - axis:
+         values: '{obj:archs}'
+      - axis: &lttng-ust_matrix_axis_conf
          type: user-defined
          name: conf
-         values: '{obj:conf}'
-      - axis:
-         type: user-defined
-         name: liburcu_version
-         values: '{obj:liburcu_version}'
-      - axis:
+         values: '{obj:confs}'
+      - axis: &lttng-ust_matrix_axis_build
          type: user-defined
          name: build
-         values: '{obj:build}'
+         values: '{obj:builds}'
+      - axis: &lttng-ust_matrix_axis_liburcu_version
+         type: user-defined
+         name: liburcu_version
+         values: '{obj:liburcu_versions}'
 
-- lttng-ust_build_axes_gerrit_lttng-tools: &lttng-ust_build_axes_gerrit_lttng-tools
-    name: 'lttng-ust_build_axes_gerrit_lttng-tools'
+- lttng-ust_matrix_axes_gerrit_lttng-tools: &lttng-ust_matrix_axes_gerrit_lttng-tools
+    name: 'lttng-ust_matrix_axes_gerrit_lttng-tools'
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
-    execution-strategy:
-      combination-filter: '{filter}'
+    execution-strategy: *lttng-ust_matrix_execution-strategy_defaults
     axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-      - axis:
-         type: user-defined
-         name: conf
-         values: '{obj:conf}'
-      - axis:
-         type: user-defined
-         name: build
-         values: '{obj:build}'
+      - axis: *lttng-ust_matrix_axis_arch
+      - axis: *lttng-ust_matrix_axis_conf
+      - axis: *lttng-ust_matrix_axis_build
+
+- lttng-ust_steps_copyartifact_defaults:
+    name: 'lttng-ust_steps_copyartifact_defaults'
+    steps:
+      - copyartifact: &lttng-ust_steps_copyartifact_defaults
+          project: ''
+          which-build: last-successful
+          stable: false
+          filter: 'build/**'
+          target: 'deps'
+          do-not-fingerprint: true
 
-- lttng-ust_build_builders_defaults: &lttng-ust_build_builders_defaults
-    name: 'lttng-ust_build_builders_defaults'
+- lttng-ust_builders_defaults: &lttng-ust_builders_defaults
+    name: 'lttng-ust_builders_defaults'
     builders:
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (std|agents)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std'
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (debug-rcu)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std'
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (tls_fallback)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=tls_fallback,build=std'
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
+      # Generate a properties file to add additionnal env
+      - shell: |
+          #!/bin/bash
+          set -exu
+          # Select the liburcu conf based on the current conf
+          case "$conf" in
+            debug-rcu|tls_fallback)
+            liburcu_conf=$conf
+            ;;
+            *)
+            liburcu_conf=std
+            ;;
+          esac
+          echo "liburcu_conf=$liburcu_conf" > env.properties
+
+      # Inject the additionnal env early to use them in the copyartifact step
+      - inject:
+          properties-file: env.properties
+
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std'
+
+      # Run the build
       - shell:
          !include-raw-escape:
            - scripts/common/print.sh
            - scripts/lttng-ust/build.sh
 
-- lttng-ust_build_builders_gerrit_lttng-tools: &lttng-ust_build_builders_gerrit_lttng-tools
-    name: 'lttng-ust_build_builders_gerrit_lttng-tools'
+- lttng-ust_builders_gerrit_lttng-tools: &lttng-ust_builders_gerrit_lttng-tools
+    name: 'lttng-ust_builders_gerrit_lttng-tools'
+
     builders:
-      - conditional-step:
-          condition-kind: strings-match
-          condition-string1: '$GERRIT_BRANCH'
-          condition-string2: master
-          on-evaluation-failure: run
-          steps:
-            - inject:
-                properties-content: liburcu_version=master
-      - conditional-step:
-          condition-kind: not
-          on-evaluation-failure: run
-          condition-operand:
-              condition-kind: strings-match
-              condition-string1: '$GERRIT_BRANCH'
-              condition-string2: master
-          steps:
-            - inject:
-                 properties-content: 'liburcu_version={liburcu_version}'
-
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (std|agents)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (debug-rcu)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (tls_fallback)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=tls_fallback,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
+      # Generate a properties file to add additionnal env
+      - shell: |
+          #!/bin/bash
+          set -exu
+          # Select the liburcu conf based on the current conf
+          case "$conf" in
+            debug-rcu|tls_fallback)
+            liburcu_conf=$conf
+            ;;
+            *)
+            liburcu_conf=std
+            ;;
+          esac
+          echo "liburcu_conf=$liburcu_conf" >> env.properties
+          # Select the liburcu version based on the gerrit branch
+          case "$GERRIT_BRANCH" in
+            master)
+            liburcu_version=master
+            ;;
+            *)
+            liburcu_version={liburcu_version}
+            ;;
+          esac
+          echo "liburcu_version=$liburcu_version" >> env.properties
+
+      # Inject the additionnal env early to use them in the copyartifact step
+      - inject:
+          properties-file: env.properties
+
       - copyartifact:
-          project: babeltrace_{babeltrace_version}_{buildtype}/arch=${{arch}},conf=std,build=std
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std'
+
+      - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
+          project: 'babeltrace_{babeltrace_version}_{buildtype}/arch=${{arch}},conf=std,build=std'
+
+      - shell: |
+           #!/bin/bash
+           set -exu
+           git clone -b "$GERRIT_BRANCH" https://review.lttng.org/lttng-tools src/lttng-tools
 
-      - shell:
-         !include-raw-escape:
-           - scripts/lttng-ust/gerrit-checkout-tools.sh
       - shell:
          !include-raw-escape:
            - scripts/common/print.sh
            - scripts/lttng-ust/build.sh
+
       - shell:
          !include-raw-escape:
            - scripts/lttng-tools/gerrit-install-deps.sh
+
       - shell:
          !include-raw-escape:
            - scripts/common/print.sh
            - scripts/lttng-tools/build.sh
 
-- lttng-ust_build_publishers_defaults: &lttng-ust_build_publishers_defaults
-    name: 'lttng-ust_build_publishers_defaults'
+- lttng-ust_publishers_defaults: &lttng-ust_publishers_defaults
+    name: 'lttng-ust_publishers_defaults'
     publishers:
-      - tap:
+      - tap: &lttng-ust_publisher_tap_defaults
           results: 'tap/**/*.log'
           fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
-      - warnings:
-          console-log-parsers:
-            - 'GNU Make + GNU C Compiler (gcc)'
-          total-thresholds:
-            unstable:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-      - archive:
+      - raw: &lttng-ust_publisher_warnings-ng_defaults
+          xml: |
+            <io.jenkins.plugins.analysis.core.steps.IssuesRecorder plugin="warnings-ng">
+              <analysisTools>
+                <io.jenkins.plugins.analysis.warnings.Gcc4>
+                  <id/>
+                  <name/>
+                  <jenkins plugin="plugin-util-api"/>
+                  <pattern/>
+                  <reportEncoding/>
+                  <skipSymbolicLinks>false</skipSymbolicLinks>
+                </io.jenkins.plugins.analysis.warnings.Gcc4>
+                <io.jenkins.plugins.analysis.warnings.Clang>
+                  <id/>
+                  <name/>
+                  <jenkins plugin="plugin-util-api"/>
+                  <pattern/>
+                  <reportEncoding/>
+                  <skipSymbolicLinks>false</skipSymbolicLinks>
+                </io.jenkins.plugins.analysis.warnings.Clang>
+              </analysisTools>
+              <sourceCodeEncoding/>
+              <sourceDirectory/>
+              <sourceDirectories/>
+              <ignoreQualityGate>false</ignoreQualityGate>
+              <ignoreFailedBuilds>true</ignoreFailedBuilds>
+              <failOnError>false</failOnError>
+              <healthy>0</healthy>
+              <unhealthy>0</unhealthy>
+              <minimumSeverity plugin="analysis-model-api">
+                <name>LOW</name>
+              </minimumSeverity>
+              <filters/>
+              <isEnabledForFailure>true</isEnabledForFailure>
+              <isAggregatingResults>true</isAggregatingResults>
+              <isBlameDisabled>false</isBlameDisabled>
+              <skipPublishingChecks>true</skipPublishingChecks>
+              <publishAllIssues>false</publishAllIssues>
+              <qualityGates>
+                <io.jenkins.plugins.analysis.core.util.QualityGate>
+                  <threshold>1</threshold>
+                  <type>TOTAL</type>
+                  <status>WARNING</status>
+                </io.jenkins.plugins.analysis.core.util.QualityGate>
+              </qualityGates>
+              <trendChartType>AGGREGATION_TOOLS</trendChartType>
+              <scm/>
+            </io.jenkins.plugins.analysis.core.steps.IssuesRecorder>
+      - archive: &lttng-ust_publisher_archive_defaults
           artifacts: 'build/**,tap/**'
           allow-empty: false
-      - workspace-cleanup
-      - email-ext:
+      - workspace-cleanup: &lttng-ust_publisher_workspace-cleanup_defaults
+          clean-if:
+            - failure: false
+      - email-ext: &lttng-ust_publisher_email-ext_defaults
           recipients: '{obj:email_to}'
           reply-to: ci-notification@lists.lttng.org
           always: false
@@ -261,24 +271,72 @@
           send-to:
             - recipients
 
-
-## Templates
-- job-template:
-    name: lttng-ust_{version}_{buildtype}
-    defaults: lttng-ust
-
-    <<: *lttng-ust_build_axes_defaults
-    <<: *lttng-ust_build_builders_defaults
-    <<: *lttng-ust_build_publishers_defaults
+- lttng-ust_publishers_gerrit: &lttng-ust_publishers_gerrit
+    name: 'lttng-ust_publishers_gerrit'
+    publishers:
+      - tap: *lttng-ust_publisher_tap_defaults
+      # Fail job on any compiler warnings
+      - raw:
+          xml: |
+            <io.jenkins.plugins.analysis.core.steps.IssuesRecorder plugin="warnings-ng">
+              <analysisTools>
+                <io.jenkins.plugins.analysis.warnings.Gcc4>
+                  <id/>
+                  <name/>
+                  <jenkins plugin="plugin-util-api"/>
+                  <pattern/>
+                  <reportEncoding/>
+                  <skipSymbolicLinks>false</skipSymbolicLinks>
+                </io.jenkins.plugins.analysis.warnings.Gcc4>
+                <io.jenkins.plugins.analysis.warnings.Clang>
+                  <id/>
+                  <name/>
+                  <jenkins plugin="plugin-util-api"/>
+                  <pattern/>
+                  <reportEncoding/>
+                  <skipSymbolicLinks>false</skipSymbolicLinks>
+                </io.jenkins.plugins.analysis.warnings.Clang>
+              </analysisTools>
+              <sourceCodeEncoding/>
+              <sourceDirectory/>
+              <sourceDirectories/>
+              <ignoreQualityGate>false</ignoreQualityGate>
+              <ignoreFailedBuilds>true</ignoreFailedBuilds>
+              <failOnError>false</failOnError>
+              <healthy>0</healthy>
+              <unhealthy>0</unhealthy>
+              <minimumSeverity plugin="analysis-model-api">
+                <name>LOW</name>
+              </minimumSeverity>
+              <filters/>
+              <isEnabledForFailure>true</isEnabledForFailure>
+              <isAggregatingResults>true</isAggregatingResults>
+              <isBlameDisabled>false</isBlameDisabled>
+              <skipPublishingChecks>true</skipPublishingChecks>
+              <publishAllIssues>false</publishAllIssues>
+              <qualityGates>
+                <io.jenkins.plugins.analysis.core.util.QualityGate>
+                  <threshold>1</threshold>
+                  <type>TOTAL</type>
+                  <status>FAILED</status>
+                </io.jenkins.plugins.analysis.core.util.QualityGate>
+              </qualityGates>
+              <trendChartType>AGGREGATION_TOOLS</trendChartType>
+              <scm/>
+            </io.jenkins.plugins.analysis.core.steps.IssuesRecorder>
+      - archive: *lttng-ust_publisher_archive_defaults
+      - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
 
 
+## Templates
 - job-template:
     name: '{job_prefix}lttng-ust_{version}_{buildtype}'
     defaults: lttng-ust
 
-    <<: *lttng-ust_build_axes_defaults
-    <<: *lttng-ust_build_builders_defaults
-    <<: *lttng-ust_build_publishers_defaults
+    <<: *lttng-ust_matrix_axes_defaults
+    <<: *lttng-ust_builders_defaults
+    <<: *lttng-ust_publishers_defaults
+
 
 - job-template:
     name: dev_gerrit_lttng-ust_{buildtype}
@@ -307,8 +365,9 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
 
-    <<: *lttng-ust_build_axes_defaults
-    <<: *lttng-ust_build_builders_defaults
+    <<: *lttng-ust_matrix_axes_defaults
+    <<: *lttng-ust_builders_defaults
+    <<: *lttng-ust_publishers_gerrit
 
     properties:
       - inject:
@@ -321,25 +380,6 @@
           categories:
             - 'gerrit-{buildtype}'
 
-    publishers:
-      - tap:
-          results: 'tap/**/*.log'
-          fail-if-no-results: true
-          failed-tests-mark-build-as-failure: true
-          todo-is-failure: false
-      - warnings:
-          console-log-parsers:
-            - 'GNU Make + GNU C Compiler (gcc)'
-          total-thresholds:
-            failed:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-      - archive:
-          artifacts: 'build/**,tap/**'
-          allow-empty: false
-      - workspace-cleanup
 
 - job-template:
     name: dev_gerrit_lttng-ust_lttng-tools_{buildtype}
@@ -368,8 +408,9 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
 
-    <<: *lttng-ust_build_axes_gerrit_lttng-tools
-    <<: *lttng-ust_build_builders_gerrit_lttng-tools
+    <<: *lttng-ust_matrix_axes_gerrit_lttng-tools
+    <<: *lttng-ust_builders_gerrit_lttng-tools
+    <<: *lttng-ust_publishers_gerrit
 
     properties:
       - inject:
@@ -382,25 +423,6 @@
           categories:
             - 'gerrit-{buildtype}'
 
-    publishers:
-      - tap:
-          results: 'tap/**/*.log'
-          fail-if-no-results: true
-          failed-tests-mark-build-as-failure: true
-          todo-is-failure: false
-      - warnings:
-          console-log-parsers:
-            - 'GNU Make + GNU C Compiler (gcc)'
-          total-thresholds:
-            failed:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-      - archive:
-          artifacts: 'build/**,tap/**'
-          allow-empty: false
-      - workspace-cleanup
 
 - job-template:
     name: lttng-ust_{version}_cppcheck
@@ -425,6 +447,8 @@
           recipients: 'ci-notification@lists.lttng.org'
           notify-every-unstable-build: true
           send-to-individuals: false
+      - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
+
 
 - job-template:
     name: lttng-ust_{version}_scan-build
@@ -437,12 +461,8 @@
 
     builders:
       - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
           project: liburcu_master_build/arch=amd64,conf=std,build=std
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/scan-build.sh
 
@@ -451,6 +471,8 @@
           name: 'HTML Report'
           dir: 'scan-build-archive/'
           files: 'index.html'
+      - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
+
 
 - job-template:
     name: lttng-ust_{version}_coverity
@@ -462,10 +484,10 @@
           cron: "@daily"
 
     wrappers:
-      - workspace-cleanup
+      - ansicolor: *lttng-ust_wrapper_ansicolor_defaults
+      - timeout: *lttng-ust_wrapper_timeout_defaults
       - timestamps
-      - ansicolor:
-          colormap: xterm
+      - workspace-cleanup
       - credentials-binding:
           - username-password-separated:
               credential-id: lttng-ust_coverity_token
@@ -474,20 +496,16 @@
 
     builders:
       - copyartifact:
+          <<: *lttng-ust_steps_copyartifact_defaults
           project: liburcu_master_build/arch=amd64,conf=std,build=std
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
-      - workspace-cleanup
       - archive:
           artifacts: 'analysis-results.tgz,cov-int/**'
           allow-empty: false
+      - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
 
 
 ## Views
@@ -501,52 +519,56 @@
 - project:
     name: lttng-ust
     job_prefix: ''
-    urcu_job_prefix: ''
     github_user: lttng
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     jobs:
       ## Master ##
-      - 'lttng-ust_{version}_{buildtype}':
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: master
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: master
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std, agents]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: master
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [sles12sp5]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: master
-          arch: !!python/tuple [el8]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [el8]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: freebsdbuild
           version: master
-          arch: !!python/tuple [freebsd]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [freebsd]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
+          touchstone: ''
       - 'lttng-ust_{version}_cppcheck':
           version: master
       - 'lttng-ust_{version}_scan-build':
@@ -555,76 +577,85 @@
           version: master
 
       ## Stable 2.13 ##
-      - 'lttng-ust_{version}_{buildtype}':
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.13
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.13
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std, agents]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.13
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [sles12sp5]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.13
-          arch: !!python/tuple [el8]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.13, master]
+          archs: !!python/tuple [el8]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
+          touchstone: ''
       - 'lttng-ust_{version}_cppcheck':
           version: stable-2.13
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.13
 
       ## Stable 2.12 ##
-      - 'lttng-ust_{version}_{buildtype}':
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.12
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
+          archs: !!python/tuple [amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std, agents]
+          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.12
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
+          archs: !!python/tuple [sles12sp5]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.12
-          arch: !!python/tuple [el8]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
+          archs: !!python/tuple [el8]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
+          touchstone: ''
       - 'lttng-ust_{version}_cppcheck':
           version: stable-2.12
       - 'lttng-ust_{version}_scan-build':
@@ -634,7 +665,6 @@
 - project:
     name: lttng-ust-dev-upstream
     job_prefix: dev_upstream_
-    urcu_job_prefix: 'dev_upstream_'
     github_user: lttng
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
@@ -643,107 +673,118 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.11
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.11]
+          archs: !!python/tuple [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
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.11]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, 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
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.11]
+          archs: !!python/tuple [sles12sp5]
+          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
-          arch: !!python/tuple [el8]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.11]
+          archs: !!python/tuple [el8]
+          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: build
           version: stable-2.10
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.9]
+          archs: !!python/tuple [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
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.9]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, 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
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.9]
+          archs: !!python/tuple [sles12sp5]
+          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
-          arch: !!python/tuple [el8]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9]
+          archs: !!python/tuple [el8]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          liburcu_versions: !!python/tuple [stable-0.9]
           filter: ''
+          touchstone: ''
 
 
 - project:
     name: gerrit-lttng-ust
     job_prefix: ''
-    urcu_job_prefix: ''
     github_user: lttng
     github_name: lttng-ust
     jobs:
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist, oot-dist]
-          conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.13]
+          archs: !!python/tuple [amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, agents]
+          liburcu_versions: !!python/tuple [stable-0.13]
           filter: ''
+          touchstone: ''
       - 'dev_gerrit_lttng-ust_lttng-tools_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist, oot-dist]
-          conf: !!python/tuple [std, agents]
-          liburcu_version: 'stable-0.13'
+          archs: !!python/tuple [amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, agents]
           filter: ''
+          touchstone: ''
+          liburcu_version: stable-0.13
           babeltrace_version: stable-2.0
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.13]
+          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.13]
           filter: ''
+          touchstone: ''
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: freebsdbuild
-          arch: !!python/tuple [freebsd]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.13]
+          archs: !!python/tuple [freebsd]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          liburcu_versions: !!python/tuple [stable-0.13]
           filter: ''
+          touchstone: ''
 
 - project:
     name: lttng-ust-views

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 8f667c59044117b9c997ed224755bd42e530326e..5f960b4847e5c736ad5194899cabd90e605ef6ca 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -120,49 +120,17 @@ gcc)
     export CC=gcc
     export CXX=g++
     ;;
-gcc-4.8)
-    export CC=gcc-4.8
-    export CXX=g++-4.8
-    ;;
-gcc-5)
-    export CC=gcc-5
-    export CXX=g++-5
-    ;;
-gcc-6)
-    export CC=gcc-6
-    export CXX=g++-6
-    ;;
-gcc-7)
-    export CC=gcc-7
-    export CXX=g++-7
-    ;;
-gcc-8)
-    export CC=gcc-8
-    export CXX=g++-8
+gcc-*)
+    export CC=gcc-${cc#gcc-}
+    export CXX=g++-${cc#gcc-}
     ;;
 clang)
     export CC=clang
     export CXX=clang++
     ;;
-clang-3.9)
-    export CC=clang-3.9
-    export CXX=clang++-3.9
-    ;;
-clang-4.0)
-    export CC=clang-4.0
-    export CXX=clang++-4.0
-    ;;
-clang-5.0)
-    export CC=clang-5.0
-    export CXX=clang++-5.0
-    ;;
-clang-6.0)
-    export CC=clang-6.0
-    export CXX=clang++-6.0
-    ;;
-clang-7)
-    export CC=clang-7
-    export CXX=clang++-7
+clang-*)
+    export CC=clang-${cc#clang-}
+    export CXX=clang++-${cc#clang-}
     ;;
 *)
     if [ "x$cc" != "x" ]; then
@@ -178,7 +146,7 @@ fi
 
 # Set platform variables
 case "$arch" in
-freebsd)
+freebsd*)
     export MAKE=gmake
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"

diff --git a/scripts/lttng-ust/gerrit-checkout-tools.sh b/scripts/lttng-ust/gerrit-checkout-tools.sh
deleted file mode 100755 (executable)
index 076aa48..0000000
--- a/scripts/lttng-ust/gerrit-checkout-tools.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2022 Michael Jeanson <mjeanson@efficios.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -exu
-
-# Required variables
-WORKSPACE=${WORKSPACE:-}
-
-git clone -b "$GERRIT_BRANCH" https://review.lttng.org/lttng-tools src/lttng-tools