nolabs: Reconfigure verify and merge jobs

As things are changed significantly, the verify and merge jobs
are reconfigured to not do anything until we have some unit
tests and so on.

Change-Id: I5ec6679640f8fe69808fbea3595e7c812f5206b8

diff --git a/jjb/nolabs/nolabs-jobs.yaml b/jjb/nolabs/nolabs-verify-merge-jobs.yaml
similarity index 89%
rename from jjb/nolabs/nolabs-jobs.yaml
rename to jjb/nolabs/nolabs-verify-merge-jobs.yaml
index d78969a5e2115930a01267daeb341fa8ec9fb5c3..532f37bf9950e649ed91af8a09989796dd43de88 100644 (file)
--- a/jjb/nolabs/nolabs-jobs.yaml
+++ b/jjb/nolabs/nolabs-verify-merge-jobs.yaml
@@ -19,7 +19,7 @@
 # ============LICENSE_END=========================================================
 
 - project:
 # ============LICENSE_END=========================================================
 
 - project:

-    name: 'nolabs'
+    name: 'nolabs-verify-merge'

 
     project: 'nolabs'
 
 
     project: 'nolabs'
 


@@ -28,8 +28,10 @@
           branch: '{stream}'
 
     jobs:
           branch: '{stream}'
 
     jobs:

-      - 'nolabs-verify-{stream}'
-      - 'nolabs-deploy-{stream}'
+      - 'nolabs-verify-{stream}':
+          slave-label: nolabs-dev
+      - 'nolabs-merge-{stream}':
+          slave-label: nolabs-prod

 
 - job-template:
     name: 'nolabs-verify-{stream}'
 
 - job-template:
     name: 'nolabs-verify-{stream}'


@@ -43,7 +45,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL

-          default: 'nolabs'
+          default: '{slave-label}'

           description: 'Slave label to schedule this job on.'
 
     properties:
           description: 'Slave label to schedule this job on.'
 
     properties:


@@ -86,7 +88,7 @@
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'

-              project-pattern: 'nolabs'
+              project-pattern: 'nolabs/website'

               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'


@@ -98,11 +100,12 @@
                   pattern: '.gitreview'
 
     builders:
                   pattern: '.gitreview'
 
     builders:

-      - shell:
-          !include-raw-escape: ./verify.sh
+      - shell: |
+          #!/bin/bash
+          echo "To be implemented"

 
 - job-template:
 
 - job-template:

-    name: 'nolabs-deploy-{stream}'
+    name: 'nolabs-merge-{stream}'

 
     concurrent: false
 
 
     concurrent: false
 


@@ -113,7 +116,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL

-          default: 'nolabs'
+          default: '{slave-label}'

           description: 'Slave label to schedule this job on.'
 
     properties:
           description: 'Slave label to schedule this job on.'
 
     properties:


@@ -150,7 +153,7 @@
                 comment-contains-value: 'remerge'
           projects:
             - project-compare-type: 'ANT'
                 comment-contains-value: 'remerge'
           projects:
             - project-compare-type: 'ANT'

-              project-pattern: '{project}'
+              project-pattern: 'nolabs/website'

               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'


@@ -162,7 +165,8 @@
                   pattern: '.gitreview'
 
     builders:
                   pattern: '.gitreview'
 
     builders:

-      - shell:
-          !include-raw-escape: ./deploy.sh
+      - shell: |
+          #!/bin/bash
+          echo "To be implemented"

 
 # vim: set ts=2 sw=2 expandtab:
 
 # vim: set ts=2 sw=2 expandtab: