From 924140c06b24e7c981bdc9c2c5c24cac3cb05a45 Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Fri, 8 Dec 2017 12:49:49 -0700
Subject: Make sure that stage and master builds do not trigger autodeployments

Issue: IS-39
---
 jjb/yaml/pippiandcarlos.com/ob-ctl.yaml            |  1 +
 jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml  | 32 ++++++++++++++++++++++
 jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml      |  1 +
 .../verizoncloudplatform.com/ob-deploy-branch.yaml | 32 ++++++++++++++++++++++
 4 files changed, 66 insertions(+)

diff --git a/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml b/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml
index 1fd354b..47a73bb 100644
--- a/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml
+++ b/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml
@@ -53,6 +53,7 @@
           blocking-jobs:
             - ".*ob-pipeline"
             - "ob-deploy-branch.*"
+            - "ob-autodeploy-branch.*"
           block_level: 'GLOBAL'
           queue-scanning: 'BUILDABLE'
     parameters:
diff --git a/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml b/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml
index 044d871..f4ff495 100644
--- a/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml
+++ b/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml
@@ -9,10 +9,42 @@
     jobs:
       - "ob-deploy-branch-{branch}"
 
+- project:
+    name: "ob-autodeploy-branch"
+    branch:
+      - "unstable"
+      - "develop"
+    jobs:
+      - "ob-autodeploy-branch-{branch}"
+
 - job-template:
     name: "ob-deploy-branch-{branch}"
     project-type: freestyle
     node: openbook_v4
+    properties:
+      - build-discarder:
+          days-to-keep: 0
+          num-to-keep: 1
+          artifact-days-to-keep: 0
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - ".*ob-pipeline"
+          block_level: 'GLOBAL'
+          queue-scanning: 'BUILDABLE'
+    scm:
+      - git:
+          url: git@pippiandcarlos.com:repos/openbook-v4-installer.git
+          branches:
+            - master
+    builders:
+      - shell: |
+          ./ob-deploy-branch.sh {branch}
+
+- job-template:
+    name: "ob-autodeploy-branch-{branch}"
+    project-type: freestyle
+    node: openbook_v4
     properties:
       - build-discarder:
           days-to-keep: 0
diff --git a/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml
index 62e58b3..0be8ad8 100644
--- a/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml
+++ b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml
@@ -53,6 +53,7 @@
           blocking-jobs:
             - ".*ob-pipeline"
             - "ob-deploy-branch.*"
+            - "ob-autodeploy-branch.*"
           block_level: 'GLOBAL'
           queue-scanning: 'BUILDABLE'
     parameters:
diff --git a/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml
index ef7c736..d2b41bc 100644
--- a/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml
+++ b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml
@@ -9,10 +9,42 @@
     jobs:
       - "ob-deploy-branch-{branch}"
 
+- project:
+    name: "ob-autodeploy-branch"
+    branch:
+      - "unstable"
+      - "develop"
+    jobs:
+      - "ob-autodeploy-branch-{branch}"
+
 - job-template:
     name: "ob-deploy-branch-{branch}"
     project-type: freestyle
     node: openbook_v4
+    properties:
+      - build-discarder:
+          days-to-keep: 0
+          num-to-keep: 1
+          artifact-days-to-keep: 0
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - ".*ob-pipeline"
+          block_level: 'GLOBAL'
+          queue-scanning: 'BUILDABLE'
+    scm:
+      - git:
+          url: git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git
+          branches:
+            - master
+    builders:
+      - shell: |
+          ./ob-deploy-branch.sh {branch}
+
+- job-template:
+    name: "ob-autodeploy-branch-{branch}"
+    project-type: freestyle
+    node: openbook_v4
     properties:
       - build-discarder:
           days-to-keep: 0
-- 
cgit v1.3