From afff1f88a918215eeb9060c4f43c5a332c8eb32c Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 16 May 2018 16:23:56 -0700
Subject: Rename files under jjb from 'yml' to 'yaml'

global-jjb only supports the .yaml file ending for jjb jobs. Instead of
waiting for a release we're going to rename the files.

Change-Id: Icf3339eacd2320c583333e02250998cf6b1881f7
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/kvmfornfv/kvmfornfv.yaml | 386 +++++++++++++++++++++++++++++++++++++++++++
 jjb/kvmfornfv/kvmfornfv.yml  | 386 -------------------------------------------
 2 files changed, 386 insertions(+), 386 deletions(-)
 create mode 100644 jjb/kvmfornfv/kvmfornfv.yaml
 delete mode 100644 jjb/kvmfornfv/kvmfornfv.yml

(limited to 'jjb/kvmfornfv')

diff --git a/jjb/kvmfornfv/kvmfornfv.yaml b/jjb/kvmfornfv/kvmfornfv.yaml
new file mode 100644
index 000000000..ad497e97d
--- /dev/null
+++ b/jjb/kvmfornfv/kvmfornfv.yaml
@@ -0,0 +1,386 @@
+---
+- project:
+    name: kvmfornfv
+
+    project: '{name}'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: true
+    #####################################
+    # patch verification phases
+    #####################################
+    phase:
+      - 'build':
+          slave-label: 'opnfv-build-ubuntu'
+      - 'test':
+          slave-label: 'intel-pod10'
+    #####################################
+    # patch verification phases
+    #####################################
+    testname:
+      - 'cyclictest'
+      - 'packet_forward'
+      - 'livemigration'
+    #####################################
+    # patch verification phases
+    #####################################
+    jobs:
+      - 'kvmfornfv-verify-{stream}'
+      - 'kvmfornfv-verify-{phase}-{stream}'
+      - 'kvmfornfv-merge-{stream}'
+      - 'kvmfornfv-daily-{stream}'
+      - 'kvmfornfv-daily-build-{stream}'
+      - 'kvmfornfv-{testname}-daily-test-{stream}'
+
+#####################################
+# job templates
+#####################################
+- job-template:
+    name: 'kvmfornfv-verify-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 3
+          option: 'project'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: build
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-verify-build-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-verify-test-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: true
+
+- job-template:
+    name: 'kvmfornfv-verify-{phase}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    scm:
+      - git-scm-gerrit
+
+    wrappers:
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{slave-label}-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: PHASE
+          default: '{phase}'
+          description: "Execution of kvmfornfv daily '{phase}' job ."
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-verify-{phase}-macro'
+
+- job-template:
+    name: 'kvmfornfv-merge-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-build.sh
+
+- job-template:
+    name: 'kvmfornfv-daily-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - timed: '@midnight'
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: cyclictest-build
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-daily-build-{stream}'
+              current-parameters: false
+              node-parameters: false
+              git-revision: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: cyclictest-test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-cyclictest-daily-test-{stream}'
+              current-parameters: false
+              node-parameters: false
+              git-revision: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: packetforward-test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-packet_forward-daily-test-{stream}'
+              current-parameters: false
+              node-parameters: false
+              git-revision: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: livemigration-test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'kvmfornfv-livemigration-daily-test-{stream}'
+              current-parameters: false
+              node-parameters: false
+              git-revision: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+
+- job-template:
+    name: 'kvmfornfv-daily-build-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    scm:
+      - git-scm
+
+    wrappers:
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: PHASE
+          default: 'build'
+          description: "Execution of kvmfornfv daily 'build' job ."
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-daily-build-macro'
+
+- job-template:
+    name: 'kvmfornfv-{testname}-daily-test-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    scm:
+      - git-scm
+
+    wrappers:
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'intel-pod10-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: TEST_NAME
+          default: '{testname}'
+          description: "Daily job to execute kvmfornfv '{testname}' testcase."
+      - string:
+          name: PHASE
+          default: 'test'
+          description: "Execution of kvmfornfv daily 'test' job ."
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-{testname}-daily-test-macro'
+
+#####################################
+# builder macros
+#####################################
+- builder:
+    name: 'kvmfornfv-verify-build-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-build.sh
+      - shell:
+          !include-raw: ./kvmfornfv-upload-artifact.sh
+
+- builder:
+    name: 'kvmfornfv-verify-test-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-download-artifact.sh
+      - shell:
+          !include-raw: ./kvmfornfv-test.sh
+
+- builder:
+    name: 'kvmfornfv-daily-build-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-build.sh
+      - shell:
+          !include-raw: ./kvmfornfv-upload-artifact.sh
+
+- builder:
+    name: 'kvmfornfv-cyclictest-daily-test-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-download-artifact.sh
+      - shell:
+          !include-raw: ./kvmfornfv-test.sh
+      - shell:
+          !include-raw: ./kvmfornfv-upload-artifact.sh
+
+- builder:
+    name: 'kvmfornfv-packet_forward-daily-test-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-download-artifact.sh
+      - shell:
+          !include-raw: ./kvmfornfv-test.sh
+
+- builder:
+    name: 'kvmfornfv-livemigration-daily-test-macro'
+    builders:
+      - shell:
+          !include-raw: ./kvmfornfv-download-artifact.sh
+      - shell:
+          !include-raw: ./kvmfornfv-test.sh
+
+#####################################
+# parameter macros
+#####################################
+- parameter:
+    name: 'kvmfornfv-defaults'
+    parameters:
+      - string:
+          name: GS_URL
+          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
+          description: "URL to Google Storage."
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
deleted file mode 100644
index ad497e97d..000000000
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ /dev/null
@@ -1,386 +0,0 @@
----
-- project:
-    name: kvmfornfv
-
-    project: '{name}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: true
-    #####################################
-    # patch verification phases
-    #####################################
-    phase:
-      - 'build':
-          slave-label: 'opnfv-build-ubuntu'
-      - 'test':
-          slave-label: 'intel-pod10'
-    #####################################
-    # patch verification phases
-    #####################################
-    testname:
-      - 'cyclictest'
-      - 'packet_forward'
-      - 'livemigration'
-    #####################################
-    # patch verification phases
-    #####################################
-    jobs:
-      - 'kvmfornfv-verify-{stream}'
-      - 'kvmfornfv-verify-{phase}-{stream}'
-      - 'kvmfornfv-merge-{stream}'
-      - 'kvmfornfv-daily-{stream}'
-      - 'kvmfornfv-daily-build-{stream}'
-      - 'kvmfornfv-{testname}-daily-test-{stream}'
-
-#####################################
-# job templates
-#####################################
-- job-template:
-    name: 'kvmfornfv-verify-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 3
-          option: 'project'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-verify-build-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-verify-test-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-- job-template:
-    name: 'kvmfornfv-verify-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    scm:
-      - git-scm-gerrit
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{slave-label}-defaults'
-      - 'kvmfornfv-defaults':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: PHASE
-          default: '{phase}'
-          description: "Execution of kvmfornfv daily '{phase}' job ."
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-verify-{phase}-macro'
-
-- job-template:
-    name: 'kvmfornfv-merge-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-      - 'kvmfornfv-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-build.sh
-
-- job-template:
-    name: 'kvmfornfv-daily-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-      - 'kvmfornfv-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '@midnight'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: cyclictest-build
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-daily-build-{stream}'
-              current-parameters: false
-              node-parameters: false
-              git-revision: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: cyclictest-test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-cyclictest-daily-test-{stream}'
-              current-parameters: false
-              node-parameters: false
-              git-revision: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: packetforward-test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-packet_forward-daily-test-{stream}'
-              current-parameters: false
-              node-parameters: false
-              git-revision: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: livemigration-test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'kvmfornfv-livemigration-daily-test-{stream}'
-              current-parameters: false
-              node-parameters: false
-              git-revision: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-- job-template:
-    name: 'kvmfornfv-daily-build-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-      - 'kvmfornfv-defaults':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: PHASE
-          default: 'build'
-          description: "Execution of kvmfornfv daily 'build' job ."
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-daily-build-macro'
-
-- job-template:
-    name: 'kvmfornfv-{testname}-daily-test-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'intel-pod10-defaults'
-      - 'kvmfornfv-defaults':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: TEST_NAME
-          default: '{testname}'
-          description: "Daily job to execute kvmfornfv '{testname}' testcase."
-      - string:
-          name: PHASE
-          default: 'test'
-          description: "Execution of kvmfornfv daily 'test' job ."
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-{testname}-daily-test-macro'
-
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'kvmfornfv-verify-build-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-build.sh
-      - shell:
-          !include-raw: ./kvmfornfv-upload-artifact.sh
-
-- builder:
-    name: 'kvmfornfv-verify-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-download-artifact.sh
-      - shell:
-          !include-raw: ./kvmfornfv-test.sh
-
-- builder:
-    name: 'kvmfornfv-daily-build-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-build.sh
-      - shell:
-          !include-raw: ./kvmfornfv-upload-artifact.sh
-
-- builder:
-    name: 'kvmfornfv-cyclictest-daily-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-download-artifact.sh
-      - shell:
-          !include-raw: ./kvmfornfv-test.sh
-      - shell:
-          !include-raw: ./kvmfornfv-upload-artifact.sh
-
-- builder:
-    name: 'kvmfornfv-packet_forward-daily-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-download-artifact.sh
-      - shell:
-          !include-raw: ./kvmfornfv-test.sh
-
-- builder:
-    name: 'kvmfornfv-livemigration-daily-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./kvmfornfv-download-artifact.sh
-      - shell:
-          !include-raw: ./kvmfornfv-test.sh
-
-#####################################
-# parameter macros
-#####################################
-- parameter:
-    name: 'kvmfornfv-defaults'
-    parameters:
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-          description: "URL to Google Storage."
-- 
cgit