X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fintegration.yaml;h=2573ebaee5f3bf815bd1f0503bc0a08ecf08dd11;hb=24592cc5c047b8bbdef70da291a4a216a52bdf77;hp=fb4cd90f1b80a4c09e27c01cf5f6cc37430cf91e;hpb=946bf6a79b4a5433a09fc4259cbe72d42a6d9f73;p=lttng-ci.git

diff --git a/jobs/integration.yaml b/jobs/integration.yaml
index fb4cd90..2573eba 100644
--- a/jobs/integration.yaml
+++ b/jobs/integration.yaml
@@ -1,8 +1,12 @@
 ## Jobs
 - job:
-    name: integration_ust-2.12-lower-urcu_testsuite
+    name: 'integration_ust-2.12-lower-urcu_testsuite'
+    description: |
+      <p>Job is managed by Jenkins Job Builder.</p>
     project-type: pipeline
-    dsl: !include-raw: pipelines/integration/ust-2.12-lower-urcu_testsuite.groovy
+    sandbox:  true
+    dsl:
+      !include-raw-escape: pipelines/integration/ust-2.12-lower-urcu_testsuite.groovy
 
 - job-template:
     name: 'integration_lttng-tools-{version}-32-64_testsuite'
@@ -12,76 +16,9 @@
 
       <p>Job is managed by Jenkins Job Builder.</p>
     project-type: pipeline
-    dsl: !include-jinja2: pipelines/integration/lttng-tools-_version_-32-64_testsuite.groovy.inc
-
-- job:
-    name: integration_lttng-tools-32-64_test
-    project-type: freestyle
-    concurrent: true
-    node: 'amd64-rootnode'
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - timeout:
-          timeout: 6
-          fail: true
-          type: no-activity
-    parameters:
-        - string:
-            name: 'ARTIFACT_ID'
-            default: 'null'
-            description: 'The ID of the artifact to download.'
-        - string:
-            name: 'BT_VERSION'
-            default: 'stable-2.0'
-            description: 'The version of babeltrace to use.'
-
-        - choice:
-            name: 'TEST_TYPE'
-            description: 'The test to perform.'
-            choices:
-                    - 32bit-sessiond
-                    - 32bit-relayd
-                    - 32bit-cli
-                    - canary
-    builders:
-      - copyartifact:
-          project: 'babeltrace_${BT_VERSION}_build/platform=bionic-amd64,conf=std,build=std'
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps-64'
-          do-not-fingerprint: true
-      - shell:
-          !include-raw-escape: scripts/integration/32-64/build.sh
-    publishers:
-      - postbuildscript:
-          mark-unstable-if-failed: true
-          builders:
-            - role: SLAVE
-              build-on:
-                  - SUCCESS
-                  - UNSTABLE
-                  - NOT_BUILT
-                  - ABORTED
-                  - FAILURE
-              build-steps:
-                  - shell:
-                      !include-raw-escape: scripts/integration/32-64/gather_tap_result.sh
-      - tap:
-          results: 'tap/**/*.*'
-          fail-if-no-results: true
-          failed-tests-mark-build-as-failure: true
-          todo-is-failure: false
-          output-tap-to-console: true
-          include-comment-diagnostics: true
-          plan-required: true
-          show-only-failures: true
-          verbose: true
-      - archive:
-          artifacts: 'tap/**'
-          allow-empty: false
+    sandbox:  true
+    dsl:
+      !include-jinja2: pipelines/integration/lttng-tools-_version_-32-64_testsuite.groovy.j2
 
 
 ## Views
@@ -114,4 +51,3 @@
           version: stable-2.12
           babelversion: stable-2.0
           urcu_version: stable-0.13
-      - 'integration_lttng-tools-32-64_test'