From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 22 Apr 2019 19:33:12 +0000 (-0400)
Subject: jjb: use proper yaml extentsion for lttng-scope
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=81549dfba45bbd98ec9e7fcbdd3bfeb61c30de06;p=lttng-ci.git

jjb: use proper yaml extentsion for lttng-scope

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

diff --git a/jobs/lttng-scope.yaml b/jobs/lttng-scope.yaml
new file mode 100644
index 0000000..fcdcf1f
--- /dev/null
+++ b/jobs/lttng-scope.yaml
@@ -0,0 +1,412 @@
+- defaults:
+    name: lttng-scope
+    description: |
+      Nightly build of LTTng Scope.
+
+      <p>Job is managed by Jenkins Job Builder.</p>
+
+    project-type: freestyle
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+
+    scm:
+      - git:
+          url: https://github.com/{github_user}/{github_project}.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/{github_project}
+          branches:
+            - origin/{version}
+          skip-tag: true
+
+    triggers:
+      - pollscm:
+          cron: "@hourly"
+
+    properties:
+      - build-discarder:
+          num-to-keep: 2
+
+
+## Templates
+- job-template:
+    name: lttng-scope_{version}_build
+    defaults: lttng-scope
+
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - xvfb:
+          installation-name: "default"
+          auto-display-name: true
+          parallel-build: false
+          screen: 1024x768x24
+      - timeout:
+          timeout: 120
+          fail: true
+          type: absolute
+
+    builders:
+      - shell:
+          !include-raw-escape: scripts/lttng-scope/launch-wm.sh
+      - maven-target:
+          maven-version: "default"
+          goals: "-version"
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+      - maven-target:
+          maven-version: "default"
+          goals: clean install -Dmaven.test.skip=false
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+
+    publishers:
+      - archive:
+          artifacts: '**/target/*.jar'
+          allow-empty: false
+          only-if-success: true
+      - junit:
+          results: '**/target/surefire-reports/*.xml'
+      - warnings:
+          console-log-parsers:
+            - 'Maven'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+          messages-to-ignore: |-
+            No sources found skipping Kotlin compile
+            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
+            ^Tests run:.*
+            .*Source root doesn't exist.*
+            Could not transfer metadata.*codehaus-snapshots.*
+      - workspace-cleanup
+      - email-ext:
+         recipients: '{obj:email_for_all_failure}'
+         always: false
+         unstable: true
+         first-failure: false
+         first-unstable: false
+         not-built: false
+         aborted: false
+         regression: false
+         failure: true
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+      - email-ext:
+         recipients: '{obj:email_to}'
+         reply-to: ci-notification@lists.lttng.org
+         always: false
+         unstable: false
+         first-failure: true
+         first-unstable: true
+         not-built: false
+         aborted: false
+         regression: false
+         failure: false
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+
+- job-template:
+    name: lttng-scope_{version}_winbuild
+    defaults: lttng-scope
+
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+
+    scm:
+      - git:
+          url: https://github.com/{github_user}/{github_project}.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/{github_project}
+          branches:
+            - origin/{version}
+          skip-tag: true
+          git-tool: 'jgit' # Use jgit on windows to work around path too long
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - timeout:
+          timeout: 120
+          fail: true
+          type: absolute
+
+    builders:
+      - maven-target:
+          maven-version: "default"
+          goals: clean install -Dmaven.test.skip=false
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+
+    publishers:
+      - archive:
+          artifacts: '**/target/*.jar'
+          allow-empty: false
+          only-if-success: true
+      - junit:
+          results: '**/target/surefire-reports/*.xml'
+      - warnings:
+          console-log-parsers:
+            - 'Maven'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+          messages-to-ignore: |-
+            No sources found skipping Kotlin compile
+            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
+            ^Tests run:.*
+            .*Source root doesn't exist.*
+            Could not transfer metadata.*codehaus-snapshots.*
+      - workspace-cleanup
+      - email-ext:
+         recipients: '{obj:email_for_all_failure}'
+         always: false
+         unstable: true
+         first-failure: false
+         first-unstable: false
+         not-built: false
+         aborted: false
+         regression: false
+         failure: true
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+      - email-ext:
+         recipients: '{obj:email_to}'
+         reply-to: ci-notification@lists.lttng.org
+         always: false
+         unstable: false
+         first-failure: true
+         first-unstable: true
+         not-built: false
+         aborted: false
+         regression: false
+         failure: false
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+
+
+
+- job-template:
+    name: lttng-scope_{version}_macosxbuild
+    defaults: lttng-scope
+
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - timeout:
+          timeout: 120
+          fail: true
+          type: absolute
+
+    builders:
+      - maven-target:
+          maven-version: "default"
+          goals: "-version"
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+      - maven-target:
+          maven-version: "default"
+          goals: clean install -Dmaven.test.skip=false
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+
+    publishers:
+      - archive:
+          artifacts: '**/target/*.jar'
+          allow-empty: false
+          only-if-success: true
+      - junit:
+          results: '**/target/surefire-reports/*.xml'
+      - warnings:
+          console-log-parsers:
+            - 'Maven'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+          messages-to-ignore: |-
+            No sources found skipping Kotlin compile
+            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
+            ^Tests run:.*
+            .*Source root doesn't exist.*
+            Could not transfer metadata.*codehaus-snapshots.*
+      - workspace-cleanup
+      - email-ext:
+         recipients: '{obj:email_for_all_failure}'
+         always: false
+         unstable: true
+         first-failure: false
+         first-unstable: false
+         not-built: false
+         aborted: false
+         regression: false
+         failure: true
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+      - email-ext:
+         recipients: '{obj:email_to}'
+         reply-to: ci-notification@lists.lttng.org
+         always: false
+         unstable: false
+         first-failure: true
+         first-unstable: true
+         not-built: false
+         aborted: false
+         regression: false
+         failure: false
+         second-failure: false
+         improvement: false
+         still-failing: false
+         success: false
+         fixed: false
+         fixed-unhealthy: true
+         still-unstable: false
+         pre-build: false
+         matrix-trigger: only-parent
+         send-to:
+           - recipients
+
+- job-template:
+    name: lttng-scope_{version}_coverity
+    defaults: lttng-scope
+    node: 'amd64'
+
+    triggers:
+      - pollscm:
+          cron: "@daily"
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor:
+          colormap: xterm
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: lttng-scope_coverity_token
+              username: COVERITY_SCAN_PROJECT_NAME
+              password: COVERITY_SCAN_TOKEN
+
+    scm:
+      - git:
+          url: https://github.com/{github_user}/{github_project}.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/{github_project}
+          branches:
+            - origin/{version}
+          skip-tag: true
+          basedir: src/lttng-scope
+
+    builders:
+      - maven-target:
+          maven-version: "default"
+          goals: "-version"
+          private-repository: true
+          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
+      - shell:
+          !include-raw-escape: scripts/common/coverity.sh
+
+    publishers:
+      - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
+
+
+## Project
+- project:
+    name: lttng-scope
+    github_user: lttng
+    github_project: lttng-scope
+    email_to: 'ci-notification@lists.lttng.org, cc:pproulx@efficios.com'
+    email_for_all_failure: 'pproulx@efficios.com'
+    version:
+      - master
+    jobs:
+      - 'lttng-scope_{version}_build':
+          arch: !!python/tuple [i386, amd64]
+      - 'lttng-scope_{version}_winbuild':
+          arch: !!python/tuple [win64]
+      - 'lttng-scope_{version}_macosxbuild':
+          arch: !!python/tuple [macosx]
+      - 'lttng-scope_{version}_coverity':
+          version: master
+
diff --git a/jobs/lttng-scope.yml b/jobs/lttng-scope.yml
deleted file mode 100644
index fcdcf1f..0000000
--- a/jobs/lttng-scope.yml
+++ /dev/null
@@ -1,412 +0,0 @@
-- defaults:
-    name: lttng-scope
-    description: |
-      Nightly build of LTTng Scope.
-
-      <p>Job is managed by Jenkins Job Builder.</p>
-
-    project-type: freestyle
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-
-    scm:
-      - git:
-          url: https://github.com/{github_user}/{github_project}.git
-          browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_project}
-          branches:
-            - origin/{version}
-          skip-tag: true
-
-    triggers:
-      - pollscm:
-          cron: "@hourly"
-
-    properties:
-      - build-discarder:
-          num-to-keep: 2
-
-
-## Templates
-- job-template:
-    name: lttng-scope_{version}_build
-    defaults: lttng-scope
-
-    project-type: matrix
-    node: 'master' # Applies only to matrix flyweight task
-    axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - xvfb:
-          installation-name: "default"
-          auto-display-name: true
-          parallel-build: false
-          screen: 1024x768x24
-      - timeout:
-          timeout: 120
-          fail: true
-          type: absolute
-
-    builders:
-      - shell:
-          !include-raw-escape: scripts/lttng-scope/launch-wm.sh
-      - maven-target:
-          maven-version: "default"
-          goals: "-version"
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-      - maven-target:
-          maven-version: "default"
-          goals: clean install -Dmaven.test.skip=false
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-
-    publishers:
-      - archive:
-          artifacts: '**/target/*.jar'
-          allow-empty: false
-          only-if-success: true
-      - junit:
-          results: '**/target/surefire-reports/*.xml'
-      - warnings:
-          console-log-parsers:
-            - 'Maven'
-          total-thresholds:
-            unstable:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-          messages-to-ignore: |-
-            No sources found skipping Kotlin compile
-            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
-            ^Tests run:.*
-            .*Source root doesn't exist.*
-            Could not transfer metadata.*codehaus-snapshots.*
-      - workspace-cleanup
-      - email-ext:
-         recipients: '{obj:email_for_all_failure}'
-         always: false
-         unstable: true
-         first-failure: false
-         first-unstable: false
-         not-built: false
-         aborted: false
-         regression: false
-         failure: true
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-      - email-ext:
-         recipients: '{obj:email_to}'
-         reply-to: ci-notification@lists.lttng.org
-         always: false
-         unstable: false
-         first-failure: true
-         first-unstable: true
-         not-built: false
-         aborted: false
-         regression: false
-         failure: false
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-
-- job-template:
-    name: lttng-scope_{version}_winbuild
-    defaults: lttng-scope
-
-    project-type: matrix
-    node: 'master' # Applies only to matrix flyweight task
-    axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-
-    scm:
-      - git:
-          url: https://github.com/{github_user}/{github_project}.git
-          browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_project}
-          branches:
-            - origin/{version}
-          skip-tag: true
-          git-tool: 'jgit' # Use jgit on windows to work around path too long
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - timeout:
-          timeout: 120
-          fail: true
-          type: absolute
-
-    builders:
-      - maven-target:
-          maven-version: "default"
-          goals: clean install -Dmaven.test.skip=false
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-
-    publishers:
-      - archive:
-          artifacts: '**/target/*.jar'
-          allow-empty: false
-          only-if-success: true
-      - junit:
-          results: '**/target/surefire-reports/*.xml'
-      - warnings:
-          console-log-parsers:
-            - 'Maven'
-          total-thresholds:
-            unstable:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-          messages-to-ignore: |-
-            No sources found skipping Kotlin compile
-            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
-            ^Tests run:.*
-            .*Source root doesn't exist.*
-            Could not transfer metadata.*codehaus-snapshots.*
-      - workspace-cleanup
-      - email-ext:
-         recipients: '{obj:email_for_all_failure}'
-         always: false
-         unstable: true
-         first-failure: false
-         first-unstable: false
-         not-built: false
-         aborted: false
-         regression: false
-         failure: true
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-      - email-ext:
-         recipients: '{obj:email_to}'
-         reply-to: ci-notification@lists.lttng.org
-         always: false
-         unstable: false
-         first-failure: true
-         first-unstable: true
-         not-built: false
-         aborted: false
-         regression: false
-         failure: false
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-
-
-
-- job-template:
-    name: lttng-scope_{version}_macosxbuild
-    defaults: lttng-scope
-
-    project-type: matrix
-    node: 'master' # Applies only to matrix flyweight task
-    axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - timeout:
-          timeout: 120
-          fail: true
-          type: absolute
-
-    builders:
-      - maven-target:
-          maven-version: "default"
-          goals: "-version"
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-      - maven-target:
-          maven-version: "default"
-          goals: clean install -Dmaven.test.skip=false
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-
-    publishers:
-      - archive:
-          artifacts: '**/target/*.jar'
-          allow-empty: false
-          only-if-success: true
-      - junit:
-          results: '**/target/surefire-reports/*.xml'
-      - warnings:
-          console-log-parsers:
-            - 'Maven'
-          total-thresholds:
-            unstable:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
-          messages-to-ignore: |-
-            No sources found skipping Kotlin compile
-            Ignoring project type pom - supportedProjectTypes = \[jar, bundle\]
-            ^Tests run:.*
-            .*Source root doesn't exist.*
-            Could not transfer metadata.*codehaus-snapshots.*
-      - workspace-cleanup
-      - email-ext:
-         recipients: '{obj:email_for_all_failure}'
-         always: false
-         unstable: true
-         first-failure: false
-         first-unstable: false
-         not-built: false
-         aborted: false
-         regression: false
-         failure: true
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-      - email-ext:
-         recipients: '{obj:email_to}'
-         reply-to: ci-notification@lists.lttng.org
-         always: false
-         unstable: false
-         first-failure: true
-         first-unstable: true
-         not-built: false
-         aborted: false
-         regression: false
-         failure: false
-         second-failure: false
-         improvement: false
-         still-failing: false
-         success: false
-         fixed: false
-         fixed-unhealthy: true
-         still-unstable: false
-         pre-build: false
-         matrix-trigger: only-parent
-         send-to:
-           - recipients
-
-- job-template:
-    name: lttng-scope_{version}_coverity
-    defaults: lttng-scope
-    node: 'amd64'
-
-    triggers:
-      - pollscm:
-          cron: "@daily"
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor:
-          colormap: xterm
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: lttng-scope_coverity_token
-              username: COVERITY_SCAN_PROJECT_NAME
-              password: COVERITY_SCAN_TOKEN
-
-    scm:
-      - git:
-          url: https://github.com/{github_user}/{github_project}.git
-          browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_project}
-          branches:
-            - origin/{version}
-          skip-tag: true
-          basedir: src/lttng-scope
-
-    builders:
-      - maven-target:
-          maven-version: "default"
-          goals: "-version"
-          private-repository: true
-          settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-      - shell:
-          !include-raw-escape: scripts/common/coverity.sh
-
-    publishers:
-      - workspace-cleanup
-      - archive:
-          artifacts: 'analysis-results.tgz,cov-int/**'
-          allow-empty: false
-
-
-## Project
-- project:
-    name: lttng-scope
-    github_user: lttng
-    github_project: lttng-scope
-    email_to: 'ci-notification@lists.lttng.org, cc:pproulx@efficios.com'
-    email_for_all_failure: 'pproulx@efficios.com'
-    version:
-      - master
-    jobs:
-      - 'lttng-scope_{version}_build':
-          arch: !!python/tuple [i386, amd64]
-      - 'lttng-scope_{version}_winbuild':
-          arch: !!python/tuple [win64]
-      - 'lttng-scope_{version}_macosxbuild':
-          arch: !!python/tuple [macosx]
-      - 'lttng-scope_{version}_coverity':
-          version: master
-