Merge "Fix Yamllint Violations for jjb/netready"

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 302bbc9..12514b6 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
@@ -8,17 +9,17 @@
     project: '{name}'
 
     jobs:
-        - 'availability-verify-{stream}'
+      - 'availability-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: 'false'
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: 'false'
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: 'false'
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: 'false'
 
 - job-template:
     name: 'availability-verify-{stream}'
@@ -26,38 +27,38 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell: |
-            echo "Nothing to verify!"
+      - shell: |
+          echo "Nothing to verify!"

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index d2ce649..593bbf7 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
@@ -8,17 +9,17 @@
     project: '{name}'
 
     jobs:
-        - 'conductor-verify-{stream}'
+      - 'conductor-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'conductor-verify-{stream}'
@@ -26,38 +27,38 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell: |
-            echo "Nothing to verify!"
+      - shell: |
+          echo "Nothing to verify!"

diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml
index 8c9be12..80b9b69 100644 (file)
--- a/jjb/domino/domino.yml
+++ b/jjb/domino/domino.yml
@@ -1,20 +1,21 @@
+---
 - project:
     name: domino
 
     project: '{name}'
 
     jobs:
-        - 'domino-verify-{stream}'
+      - 'domino-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'domino-verify-{stream}'
@@ -22,39 +23,39 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            ./tests/run.sh
+      - shell: |
+          #!/bin/bash
+          ./tests/run.sh

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 59c9461..2acc96f 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -94,6 +94,21 @@
           default-slaves:
             - lf-pod3
 
+- parameter:
+    name: 'arm-pod5-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - arm-pod5
+          default-slaves:
+            - arm-pod5
+      - string:
+          name: BRIDGE
+          default: 'admin7_br0,mgmt7_br0,,public7_br0'
+          description: 'Pre-existing bridges used by Fuel'
+
 - parameter:
     name: 'lf-pod1-defaults'
     parameters:
@@ -113,6 +128,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'lf-pod2-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - lf-pod2
+          default-slaves:
+            - lf-pod2
+      - string:
+          name: BRIDGE
+          default: 'pxebr,br-ctl'
+          description: 'Pre-existing bridges used by Fuel'
+
 - parameter:
     name: 'lf-pod3-defaults'
     parameters:
@@ -834,6 +864,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'arm-virtual2-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - arm-virtual2
+          default-slaves:
+            - arm-virtual2
+      - string:
+          name: BRIDGE
+          default: ',,,public8_br0'
+          description: 'Pre-existing bridges used by Fuel'
+
 - parameter:
     name: 'intel-virtual6-defaults'
     parameters:

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index b0db764..cc143bf 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
@@ -8,17 +9,17 @@
     project: '{name}'
 
     jobs:
-        - 'ipv6-verify-{stream}'
+      - 'ipv6-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'ipv6-verify-{stream}'
@@ -26,38 +27,38 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell: |
-            echo "Nothing to verify!"
+      - shell: |
+          echo "Nothing to verify!"

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index a39249a..5aafb09 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -1,42 +1,44 @@
+---
 - project:
     name: kvmfornfv
 
     project: '{name}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: true
-#####################################
-# patch verification phases
-#####################################
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          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
-#####################################
+      - 'build':
+          slave-label: 'opnfv-build-ubuntu'
+      - 'test':
+          slave-label: 'intel-pod10'
+    #####################################
+    # patch verification phases
+    #####################################
     testname:
-        - 'cyclictest'
-        - 'packet_forward'
-        - 'livemigration'
-#####################################
-# patch verification phases
-#####################################
+      - '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}'
+      - 'kvmfornfv-verify-{stream}'
+      - 'kvmfornfv-verify-{phase}-{stream}'
+      - 'kvmfornfv-merge-{stream}'
+      - 'kvmfornfv-daily-{stream}'
+      - 'kvmfornfv-daily-build-{stream}'
+      - 'kvmfornfv-{testname}-daily-test-{stream}'
+
 #####################################
 # job templates
 #####################################
@@ -50,71 +52,72 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 3
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 3
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - 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/**'
+      - 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
+      - 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}'
 
@@ -123,29 +126,30 @@
     concurrent: true
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 360
-            fail: true
+      - 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 ."
+      - 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'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-verify-{phase}-macro'
 
 - job-template:
     name: 'kvmfornfv-merge-{stream}'
@@ -153,33 +157,33 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
-        - 'kvmfornfv-defaults':
-            gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-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}'
+      - 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
+      - shell:
+          !include-raw: ./kvmfornfv-build.sh
 
 - job-template:
     name: 'kvmfornfv-daily-{stream}'
@@ -191,63 +195,62 @@
     concurrent: false
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
-        - 'kvmfornfv-defaults':
-            gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'kvmfornfv-defaults':
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - timed: '@midnight'
+      - 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
-
+      - 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}'
@@ -257,29 +260,29 @@
     concurrent: false
 
     scm:
-        - git-scm
+      - git-scm
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 360
-            fail: true
+      - 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 ."
+      - 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'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-daily-build-macro'
 
 - job-template:
     name: 'kvmfornfv-{testname}-daily-test-{stream}'
@@ -289,80 +292,87 @@
     concurrent: false
 
     scm:
-        - git-scm
+      - git-scm
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 360
-            fail: true
+      - 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 ."
+      - 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'
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+      - 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
+      - shell:
+          !include-raw: ./kvmfornfv-download-artifact.sh
+      - shell:
+          !include-raw: ./kvmfornfv-test.sh
 
 #####################################
 # parameter macros
@@ -370,7 +380,7 @@
 - parameter:
     name: 'kvmfornfv-defaults'
     parameters:
-        - string:
-            name: GS_URL
-            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-            description: "URL to Google Storage."
+      - string:
+          name: GS_URL
+          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
+          description: "URL to Google Storage."

diff --git a/jjb/models/models.yml b/jjb/models/models.yml
index 6831036..3a9f4c6 100644 (file)
--- a/jjb/models/models.yml
+++ b/jjb/models/models.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
@@ -8,17 +9,17 @@
     project: '{name}'
 
     jobs:
-        - 'models-verify-{stream}'
+      - 'models-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'models-verify-{stream}'
@@ -26,43 +27,43 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o nounset
+          set -o pipefail
 
-            # shellcheck -f tty tests/*.sh
+          # shellcheck -f tty tests/*.sh

diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml
index fb28feb..573b098 100644 (file)
--- a/jjb/moon/moon.yml
+++ b/jjb/moon/moon.yml
@@ -1,54 +1,55 @@
+---
 - project:
     name: moon
 
     project: '{name}'
 
     jobs:
-        - 'moon-verify-{stream}'
+      - 'moon-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
 
 - job-template:
     name: 'moon-verify-{stream}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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/**|.gitignore'
+      - 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/**|.gitignore'
 
     builders:
-        - shell:
-            #!/bin/bash
-            echo "launch Moon unit tests"
-            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
+      - shell:
+          #!/bin/bash
+          echo "launch Moon unit tests"
+          nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 414eba2..5b63f3a 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -51,6 +51,10 @@
             project: 'functest'
             <<: *master
             <<: *functest-receivers
+        - 'nfvbench':
+            project: 'nfvbench'
+            <<: *master
+            <<: *other-receivers
         - 'qtip':
             project: 'qtip'
             <<: *master