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/3rd_party_ci/odl-netvirt.yaml | 239 ++++++++++++++++++++++++++++++++++++++
 jjb/3rd_party_ci/odl-netvirt.yml  | 239 --------------------------------------
 2 files changed, 239 insertions(+), 239 deletions(-)
 create mode 100644 jjb/3rd_party_ci/odl-netvirt.yaml
 delete mode 100644 jjb/3rd_party_ci/odl-netvirt.yml

(limited to 'jjb/3rd_party_ci')

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
new file mode 100644
index 000000000..863eb94dd
--- /dev/null
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -0,0 +1,239 @@
+---
+- project:
+    name: 'netvirt'
+
+    project: 'netvirt'
+
+    installer: 'netvirt'
+    #####################################
+    # branch definitions
+    #####################################
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - carbon:
+          branch: 'stable/carbon'
+          gs-pathname: ''
+          disabled: false
+    #####################################
+    # patch verification phases
+    #####################################
+    phase:
+      - 'create-apex-vms':
+          slave-label: 'odl-netvirt-virtual-intel'
+      - 'install-netvirt':
+          slave-label: 'odl-netvirt-virtual-intel'
+      - 'postprocess':
+          slave-label: 'odl-netvirt-virtual-intel'
+    #####################################
+    # jobs
+    #####################################
+    jobs:
+      - 'odl-netvirt-verify-virtual-{stream}'
+      - 'odl-netvirt-verify-virtual-{phase}-{stream}'
+
+#####################################
+# job templates
+#####################################
+- job-template:
+    name: 'odl-netvirt-verify-virtual-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 5
+          max-per-node: 1
+          option: 'project'
+
+    scm:
+      - git:
+          url: https://gerrit.opnfv.org/gerrit/apex
+          branches:
+            - 'origin/master'
+          timeout: 15
+          wipe-workspace: true
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: NETVIRT_ARTIFACT
+          default: distribution-karaf.tar.gz
+      - 'odl-netvirt-virtual-intel-defaults'
+
+    triggers:
+      - gerrit:
+          server-name: 'git.opendaylight.org'
+          trigger-on:
+            # yamllint disable rule:line-length
+            # - comment-added-contains-event:
+            #     comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : SUCCESS'
+            # - comment-added-contains-event:
+            #     comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE'
+            # yamllint enable rule:line-length
+            - comment-added-contains-event:
+                comment-contains-value: 'opnfv-test'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          readable-message: true
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: create-apex-vms
+          condition: SUCCESSFUL
+          projects:
+            - name: 'odl-netvirt-verify-virtual-create-apex-vms-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
+                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
+                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
+                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+                APEX_ENV_NUMBER=$APEX_ENV_NUMBER
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: install-netvirt
+          condition: SUCCESSFUL
+          projects:
+            - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                ODL_BRANCH={branch}
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
+                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
+                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
+                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: functest
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-netvirt-virtual-suite-master'
+              predefined-parameters: |
+                DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+                FUNCTEST_MODE=testcase
+                FUNCTEST_SUITE_NAME=odl_netvirt
+                RC_FILE_PATH=$HOME/cloner-info/overcloudrc
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: false
+      - multijob:
+          name: postprocess
+          condition: ALWAYS
+          projects:
+            - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
+                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
+                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
+                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: false
+
+- job-template:
+    name: 'odl-netvirt-verify-virtual-{phase}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 5
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'odl-netvirt-verify-virtual-create-apex-vms-.*'
+            - 'odl-netvirt-verify-virtual-install-netvirt-.*'
+            - 'functest-netvirt-virtual-suite-.*'
+            - 'odl-netvirt-verify-virtual-postprocess-.*'
+          block-level: 'NODE'
+
+    wrappers:
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+
+    scm:
+      - git:
+          url: https://gerrit.opnfv.org/gerrit/apex
+          branches:
+            - 'origin/master'
+          timeout: 15
+          wipe-workspace: true
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-odl_l2-bgpvpn-noha'
+          description: 'Scenario to deploy and test'
+      - string:
+          name: GS_URL
+          default: artifacts.opnfv.org/apex
+          description: "URL to Google Storage with snapshot artifacts."
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-verify-{phase}-builder'
+#####################################
+# builder macros
+#####################################
+- builder:
+    name: 'netvirt-verify-create-apex-vms-builder'
+    builders:
+      - shell:
+          !include-raw: ../apex/apex-snapshot-deploy.sh
+- builder:
+    name: 'netvirt-verify-install-netvirt-builder'
+    builders:
+      - shell:
+          !include-raw: ./download-netvirt-artifact.sh
+      - shell:
+          !include-raw: ./install-netvirt.sh
+- builder:
+    name: 'netvirt-verify-postprocess-builder'
+    builders:
+      - shell:
+          !include-raw: ./postprocess-netvirt.sh
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
deleted file mode 100644
index 863eb94dd..000000000
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ /dev/null
@@ -1,239 +0,0 @@
----
-- project:
-    name: 'netvirt'
-
-    project: 'netvirt'
-
-    installer: 'netvirt'
-    #####################################
-    # branch definitions
-    #####################################
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - carbon:
-          branch: 'stable/carbon'
-          gs-pathname: ''
-          disabled: false
-    #####################################
-    # patch verification phases
-    #####################################
-    phase:
-      - 'create-apex-vms':
-          slave-label: 'odl-netvirt-virtual-intel'
-      - 'install-netvirt':
-          slave-label: 'odl-netvirt-virtual-intel'
-      - 'postprocess':
-          slave-label: 'odl-netvirt-virtual-intel'
-    #####################################
-    # jobs
-    #####################################
-    jobs:
-      - 'odl-netvirt-verify-virtual-{stream}'
-      - 'odl-netvirt-verify-virtual-{phase}-{stream}'
-
-#####################################
-# job templates
-#####################################
-- job-template:
-    name: 'odl-netvirt-verify-virtual-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 5
-          max-per-node: 1
-          option: 'project'
-
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/apex
-          branches:
-            - 'origin/master'
-          timeout: 15
-          wipe-workspace: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: NETVIRT_ARTIFACT
-          default: distribution-karaf.tar.gz
-      - 'odl-netvirt-virtual-intel-defaults'
-
-    triggers:
-      - gerrit:
-          server-name: 'git.opendaylight.org'
-          trigger-on:
-            # yamllint disable rule:line-length
-            # - comment-added-contains-event:
-            #     comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : SUCCESS'
-            # - comment-added-contains-event:
-            #     comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE'
-            # yamllint enable rule:line-length
-            - comment-added-contains-event:
-                comment-contains-value: 'opnfv-test'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          readable-message: true
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: create-apex-vms
-          condition: SUCCESSFUL
-          projects:
-            - name: 'odl-netvirt-verify-virtual-create-apex-vms-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
-                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
-                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
-                APEX_ENV_NUMBER=$APEX_ENV_NUMBER
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: install-netvirt
-          condition: SUCCESSFUL
-          projects:
-            - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                ODL_BRANCH={branch}
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
-                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
-                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: functest
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-netvirt-virtual-suite-master'
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
-                FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=odl_netvirt
-                RC_FILE_PATH=$HOME/cloner-info/overcloudrc
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: false
-      - multijob:
-          name: postprocess
-          condition: ALWAYS
-          projects:
-            - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
-                GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
-                NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: false
-
-- job-template:
-    name: 'odl-netvirt-verify-virtual-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 5
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'odl-netvirt-verify-virtual-create-apex-vms-.*'
-            - 'odl-netvirt-verify-virtual-install-netvirt-.*'
-            - 'functest-netvirt-virtual-suite-.*'
-            - 'odl-netvirt-verify-virtual-postprocess-.*'
-          block-level: 'NODE'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/apex
-          branches:
-            - 'origin/master'
-          timeout: 15
-          wipe-workspace: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{slave-label}-defaults'
-      - '{installer}-defaults'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-bgpvpn-noha'
-          description: 'Scenario to deploy and test'
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/apex
-          description: "URL to Google Storage with snapshot artifacts."
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-verify-{phase}-builder'
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'netvirt-verify-create-apex-vms-builder'
-    builders:
-      - shell:
-          !include-raw: ../apex/apex-snapshot-deploy.sh
-- builder:
-    name: 'netvirt-verify-install-netvirt-builder'
-    builders:
-      - shell:
-          !include-raw: ./download-netvirt-artifact.sh
-      - shell:
-          !include-raw: ./install-netvirt.sh
-- builder:
-    name: 'netvirt-verify-postprocess-builder'
-    builders:
-      - shell:
-          !include-raw: ./postprocess-netvirt.sh
-- 
cgit 1.2.3-korg