IS-29 and IS-30

6 files changed, 194 insertions, 96 deletions

diff --git a/jjb/yaml/image-foundry-if-pipeline.yaml b/jjb/yaml/image-foundry-if-pipeline.yaml
new file mode 100644
index 0000000..c4e90dc
--- /dev/null
+++ b/jjb/yaml/image-foundry-if-pipeline.yaml
@@ -0,0 +1,25 @@
+---
+- job:
+    name: image-foundry-if-pipeline
+    project-type: pipeline
+    dsl: |
+      pipeline {
+          agent {
+              node {
+                  label "image_foundry"
+              }
+          }
+          stages {
+              stage("checkout-elements") {
+                  steps {
+                      git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry-vzw.git")
+                  }
+              }
+              stage("diskimage-builder") {
+                  steps {
+                      git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry.git")
+                      sh(script: "./ci-script.sh")
+                  }
+              }
+          }
+      }
diff --git a/jjb/yaml/deploy-branch.yaml b/jjb/yaml/ob-deploy-branch.yaml
index a8a3746..277e749 100644
--- a/jjb/yaml/deploy-branch.yaml
+++ b/jjb/yaml/ob-deploy-branch.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: "deploy-branch"
+    name: "ob-deploy-branch"
     branch:
       - "unstable"
       - "develop"
       - "stage"
       - "master"
     jobs:
-      - "deploy-branch-{branch}"
+      - "ob-deploy-branch-{branch}"
 
 - job-template:
-    name: "deploy-branch-{branch}"
+    name: "ob-deploy-branch-{branch}"
     project-type: freestyle
     node: openbook_v4
     properties:
@@ -21,18 +21,18 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - ".*-pipeline"
+            - ".*ob-pipeline"
           block_level: 'GLOBAL'
           queue-scanning: 'BUILDABLE'
     triggers:
       - reverse:
           jobs:
-            - "admin-api-server-{branch}-pipeline"
-            - "admin-web-ui-{branch}-pipeline"
-            - "customer-api-server-{branch}-pipeline"
-            - "customer-web-ui-{branch}-pipeline"
-            - "job-scheduler-server-{branch}-pipeline"
-            - "workflow-server-{branch}-pipeline"
+            - "admin-api-server-{branch}-ob-pipeline"
+            - "admin-web-ui-{branch}-ob-pipeline"
+            - "customer-api-server-{branch}-ob-pipeline"
+            - "customer-web-ui-{branch}-ob-pipeline"
+            - "job-scheduler-server-{branch}-ob-pipeline"
+            - "workflow-server-{branch}-ob-pipeline"
     scm:
       - git:
           url: git@github.com:Talligent/openbook-v4-installer.git
@@ -40,4 +40,4 @@
             - master
     builders:
       - shell: |
-          ./deploy-branch.sh {branch}
+          ./ob-deploy-branch.sh {branch}
diff --git a/jjb/yaml/openbook-all-pipeline.yaml b/jjb/yaml/openbook-all-ob-pipeline.yaml
index ad0fdbe..eb56bc1 100644
--- a/jjb/yaml/openbook-all-pipeline.yaml
+++ b/jjb/yaml/openbook-all-ob-pipeline.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: "openbook-all-pipeline"
+    name: "openbook-all-ob-pipeline"
     branch:
       - "unstable"
       - "develop"
       - "stage"
       - "master"
     jobs:
-      - "openbook-all-{branch}-pipeline"
+      - "openbook-all-{branch}-ob-pipeline"
 
 - job-template:
-    name: "openbook-all-{branch}-pipeline"
+    name: "openbook-all-{branch}-ob-pipeline"
     project-type: pipeline
     dsl: |
       pipeline {{
@@ -31,39 +31,34 @@
                       git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git")
                   }}
               }}
-              stage("database") {{
-                  steps {{
-                      build(job: "openbook-database")
-                  }}
-              }}
               stage("admin-api-server") {{
                   steps {{
-                      build(job: "admin-api-server-{branch}-pipeline")
+                      build(job: "admin-api-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("customer-api-server") {{
                   steps {{
-                      build(job: "customer-api-server-{branch}-pipeline")
+                      build(job: "customer-api-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("admin-web-ui") {{
                   steps {{
-                      build(job: "admin-web-ui-{branch}-pipeline")
+                      build(job: "admin-web-ui-{branch}-ob-pipeline")
                   }}
               }}
               stage("customer-web-ui") {{
                   steps {{
-                      build(job: "customer-web-ui-{branch}-pipeline")
+                      build(job: "customer-web-ui-{branch}-ob-pipeline")
                   }}
               }}
               stage("job-scheduler-server") {{
                   steps {{
-                      build(job: "job-scheduler-server-{branch}-pipeline")
+                      build(job: "job-scheduler-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("workflow-server") {{
                   steps {{
-                      build(job: "workflow-server-{branch}-pipeline")
+                      build(job: "workflow-server-{branch}-ob-pipeline")
                   }}
               }}
           }}
diff --git a/jjb/yaml/openbook-core-pipeline.yaml b/jjb/yaml/openbook-core-ob-pipeline.yaml
index 991837b..32669ab 100644
--- a/jjb/yaml/openbook-core-pipeline.yaml
+++ b/jjb/yaml/openbook-core-ob-pipeline.yaml
@@ -1,22 +1,16 @@
 ---
 - project:
-    name: "openbook-core-pipeline"
+    name: "openbook-core-ob-pipeline"
+    branch:
+      - "unstable"
+      - "develop"
+      - "stage"
+      - "master"
     jobs:
-      - "openbook-core-{branch}-pipeline":
-          branch: "unstable"
-          poll: "true"
-      - "openbook-core-{branch}-pipeline":
-          branch: "develop"
-          poll: "true"
-      - "openbook-core-{branch}-pipeline":
-          branch: "stage"
-          poll: "false"
-      - "openbook-core-{branch}-pipeline":
-          branch: "master"
-          poll: "false"
+      - "openbook-core-{branch}-ob-pipeline"
 
 - job-template:
-    name: "openbook-core-{branch}-pipeline"
+    name: "openbook-core-{branch}-ob-pipeline"
     project-type: pipeline
     dsl: |
       pipeline {{
@@ -24,7 +18,7 @@
               node {{
                 label "master"
               }}
-              }}
+          }}
           stages {{
               stage("checkout") {{
                   agent {{
@@ -34,27 +28,27 @@
                       }}
                   }}
                   steps {{
-                      git(poll: {poll}, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git")
+                      git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git")
                   }}
               }}
               stage("admin-api-server") {{
                   steps {{
-                      build(job: "admin-api-server-{branch}-pipeline")
+                      build(job: "admin-api-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("customer-api-server") {{
                   steps {{
-                      build(job: "customer-api-server-{branch}-pipeline")
+                      build(job: "customer-api-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("job-scheduler-server") {{
                   steps {{
-                      build(job: "job-scheduler-server-{branch}-pipeline")
+                      build(job: "job-scheduler-server-{branch}-ob-pipeline")
                   }}
               }}
               stage("workflow-server") {{
                   steps {{
-                      build(job: "workflow-server-{branch}-pipeline")
+                      build(job: "workflow-server-{branch}-ob-pipeline")
                   }}
               }}
           }}
diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-ob-pipeline.yaml
index 8b1b84b..657ba39 100644
--- a/jjb/yaml/openbook-pipeline.yaml
+++ b/jjb/yaml/openbook-ob-pipeline.yaml
@@ -1,130 +1,106 @@
 ---
 - project:
-    name: "openbook-pipeline"
+    name: "openbook-ob-pipeline"
     jobs:
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-api-server"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-api-server"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-api-server"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-api-server"
           branch: "master"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-web-ui"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-web-ui"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-web-ui"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "admin-web-ui"
           branch: "master"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-api-server"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-api-server"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-api-server"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-api-server"
           branch: "master"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-web-ui"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-web-ui"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-web-ui"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "customer-web-ui"
           branch: "master"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "job-scheduler-server"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "job-scheduler-server"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "job-scheduler-server"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "job-scheduler-server"
           branch: "master"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "workflow-server"
           branch: "unstable"
           tag: "4.1"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "workflow-server"
           branch: "develop"
           tag: "4.0"
-          poll: "true"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "workflow-server"
           branch: "stage"
           tag: "4.0"
-          poll: "false"
-      - "{artifact}-{branch}-pipeline":
+      - "{artifact}-{branch}-ob-pipeline":
           artifact: "workflow-server"
           branch: "master"
           tag: "4.0"
-          poll: "false"
 
 - job-template:
-    name: "{artifact}-{branch}-pipeline"
+    name: "{artifact}-{branch}-ob-pipeline"
     project-type: pipeline
     dsl: |
       pipeline {{
@@ -137,7 +113,7 @@
           stages {{
               stage("gradle") {{
                   steps {{
-                      git(poll: {poll}, branch: "{branch}", url: "git@github.com:Talligent/{artifact}.git")
+                      git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/{artifact}.git")
                       sh(script: "/var/lib/jenkins/find_next_tag.sh \$(pwd) {artifact} {tag}")
                       sh(script: "./gradlew -PbuildNumber=\$(cat /tmp/newtag_{artifact}) -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar")
                       stash(includes: "build/libs/*.jar", name: "jar")
diff --git a/jjb/yaml/openbook.yaml b/jjb/yaml/openbook.yaml
new file mode 100644
index 0000000..1e17a68
--- /dev/null
+++ b/jjb/yaml/openbook.yaml
@@ -0,0 +1,108 @@
+---
+- project:
+    name: "openobok"
+    jobs:
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-api-server"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-api-server"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-api-server"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-api-server"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-api-server"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-api-server"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-api-server"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-api-server"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-web-ui"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-web-ui"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-web-ui"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "admin-web-ui"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-web-ui"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-web-ui"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-web-ui"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "customer-web-ui"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "job-scheduler-server"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "job-scheduler-server"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "job-scheduler-server"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "job-scheduler-server"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "workflow-server"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "workflow-server"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "workflow-server"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "workflow-server"
+          branch: "master"
+      - "openbook-{artifact}-{branch}":
+          artifact: "openbook-core"
+          branch: "unstable"
+      - "openbook-{artifact}-{branch}":
+          artifact: "openbook-core"
+          branch: "develop"
+      - "openbook-{artifact}-{branch}":
+          artifact: "openbook-core"
+          branch: "stage"
+      - "openbook-{artifact}-{branch}":
+          artifact: "openbook-core"
+          branch: "master"
+
+- job-template:
+    name: "openbook-{artifact}-{branch}"
+    project-type: freestyle
+    node: openbook_v4
+    properties:
+      - build-discarder:
+          days-to-keep: 0
+          num-to-keep: 1
+          artifact-days-to-keep: 0
+    triggers:
+      - github
+    scm:
+      - git:
+          url: "git@github.com:Talligent/{artifact}.git"
+          branches:
+            - "{branch}"
+    builders:
+      - trigger-builds:
+          - project: "{artifact}-{branch}-ob-pipeline"