Rename nolabs merge job to deploy

We actually deploy the site when a change gets merged
so the job is renamed to reflect the reality.

Change-Id: I29b1b6dc16bb3412e7e531c2fd4c4a153e576586

diff --git a/jjb/nolabs/merge.sh b/jjb/nolabs/deploy.sh
similarity index 100%
rename from jjb/nolabs/merge.sh
rename to jjb/nolabs/deploy.sh

diff --git a/jjb/nolabs/nolabs-jobs.yaml b/jjb/nolabs/nolabs-jobs.yaml
index 47937b9d5346174b3a7d251ca12c85ef9e29fa2a..d78969a5e2115930a01267daeb341fa8ec9fb5c3 100644 (file)
--- a/jjb/nolabs/nolabs-jobs.yaml
+++ b/jjb/nolabs/nolabs-jobs.yaml
@@ -29,7 +29,7 @@
 
     jobs:
       - 'nolabs-verify-{stream}'
-      - 'nolabs-merge-{stream}'
+      - 'nolabs-deploy-{stream}'
 
 - job-template:
     name: 'nolabs-verify-{stream}'
@@ -102,7 +102,7 @@
           !include-raw-escape: ./verify.sh
 
 - job-template:
-    name: 'nolabs-merge-{stream}'
+    name: 'nolabs-deploy-{stream}'
 
     concurrent: false
 
@@ -163,6 +163,6 @@
 
     builders:
       - shell:
-          !include-raw-escape: ./merge.sh
+          !include-raw-escape: ./deploy.sh
 
 # vim: set ts=2 sw=2 expandtab: