X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetready%2Fnetready.yml;h=798029373c6d8fdf379e8ab42551f0ee5ec7cecc;hb=62d5bf9536dd7e03be5b7bd5770e930a97ba10fa;hp=181af3a58c14a4100b5c82789471658b8926d046;hpb=1541e31316dfbd05733dd73d4d98ef3d412f86f9;p=releng.git

diff --git a/jjb/netready/netready.yml b/jjb/netready/netready.yml
index 181af3a58..798029373 100644
--- a/jjb/netready/netready.yml
+++ b/jjb/netready/netready.yml
@@ -1,88 +1,42 @@
+---
 - project:
     name: netready
 
     project: '{name}'
 
     jobs:
-        - 'netready-verify-{stream}'
-        - 'netready-build-gluon-packages-daily-{stream}'
+      - '{project}-verify-{stream}'
+      - 'netready-build-gluon-packages-daily-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-
-- job-template:
-    name: 'netready-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: '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}'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-
-    builders:
-        - shell: |
-            echo "Nothing to verify!"
-
-
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
 
 - job-template:
     name: 'netready-build-gluon-packages-daily-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - 'netready-parameter':
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm
 
     builders:
-        - 'netready-gluon-build'
+      - 'netready-gluon-build'
 
     triggers:
-        - timed: '@midnight'
+      - timed: '@midnight'
 
 
 ########################
@@ -92,10 +46,10 @@
 - builder:
     name: 'netready-gluon-build'
     builders:
-        - shell:
-            !include-raw: ./netready-gluon-build.sh
-        - shell:
-            !include-raw: ./netready-upload-gluon-packages.sh
+      - shell:
+          !include-raw: ./netready-gluon-build.sh
+      - shell:
+          !include-raw: ./netready-upload-gluon-packages.sh
 
 
 ########################
@@ -105,11 +59,11 @@
 - parameter:
     name: netready-parameter
     parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: GS_URL
-            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-            description: "URL to Google Storage."
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build
+          description: "Directory where the build artifact will be located upon the completion of the build."
+      - string:
+          name: GS_URL
+          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
+          description: "URL to Google Storage."