X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=c5c4035e42b97d9e4450dbe705de6a46c4a3beed;hb=9f1c7888ff56af9856f6fd62e2ad800874ca79fe;hp=5c6be56b33174a80d871bf21e3a5aa279f2749d8;hpb=936c70f3b273b1a50660e5c53f274f5d9d6727be;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 5c6be56b3..c5c4035e4 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -11,11 +11,13 @@
 
     jobs:
         - 'genesis-foreman-verify-{stream}'
-        - 'genesis-foreman-merge'
+        - 'genesis-foreman-merge-{stream}'
         - 'genesis-foreman-daily-{stream}'
         - 'genesis-foreman-build-{stream}'
         - 'genesis-foreman-deploy-{stream}'
+        - 'genesis-foreman-lab-reconfig-{stream}'
         - 'genesis-foreman-deploy-runner-{stream}'
+        - 'genesis-foreman-deploy-virtual-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -97,7 +99,7 @@
         - 'foreman-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-foreman-merge'
+    name: 'genesis-foreman-merge-{stream}'
 
     project-type: freestyle
 
@@ -120,7 +122,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: ''
@@ -145,7 +147,7 @@
                 project-pattern: 'genesis'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'common/**'
@@ -163,7 +165,7 @@
 
     node: ericsson-build
 
-    disabled: false
+    disabled: true
 
     triggers:
         - 'foreman-{stream}'
@@ -174,6 +176,7 @@
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
@@ -192,7 +195,11 @@
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'genesis-foreman-deploy-runner-{stream}'
+          - project: 'genesis-foreman-lab-reconfig-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'genesis-foreman-deploy-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
@@ -202,6 +209,53 @@
           - project: 'yardstick-opnfv-jump-2'
             block: true
 
+- job-template:
+    name: 'genesis-foreman-deploy-runner-{stream}'
+
+    project-type: freestyle
+
+    disabled: false
+
+    node: master
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - foreman-parameter:
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "genesis-fuel-daily.*"
+                - "genesis-fuel-deploy-runner-{stream}"
+                - "genesis-foreman-daily.*"
+
+    builders:
+        - 'foreman-lab-reconfig'
+        - trigger-builds:
+          - project: 'genesis-foreman-deploy-{stream}'
+            git-revision: true
+            block: true
+
 - job-template:
     name: 'genesis-foreman-build-{stream}'
 
@@ -268,7 +322,7 @@
         - 'foreman-deploy'
 
 - job-template:
-    name: 'genesis-foreman-deploy-runner-{stream}'
+    name: 'genesis-foreman-lab-reconfig-{stream}'
 
     project-type: freestyle
 
@@ -299,12 +353,49 @@
             refspec: ''
             branch: '{branch}'
 
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "genesis-fuel-daily.*"
+
     builders:
         - 'foreman-lab-reconfig'
-        - trigger-builds:
-          - project: 'genesis-foreman-deploy-{stream}'
-            git-revision: true
-            block: true
+
+- job-template:
+    name: 'genesis-foreman-deploy-virtual-{stream}'
+
+    project-type: freestyle
+
+    disabled: false
+
+    node: opnfv-jump-1
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - foreman-parameter:
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    builders:
+        - 'foreman-deploy-virtual'
 
 ########################
 # parameter macros
@@ -399,8 +490,8 @@
             done
 
             if [ "$ping_flag" -eq 1 ]; then
-              echo "Slave is pingable, now wait 60 seconds for services to start"
-              sleep 60
+              echo "Slave is pingable, now wait 90 seconds for services to start"
+              sleep 90
             else
               echo "Slave did not come back up after reboot: please check opnfv-jump-2"
               exit 1
@@ -469,7 +560,7 @@
             echo
 
             # cleanup first
-            sudo $WORKSPACE/$INSTALLER/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
+            sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
 
             # and then initiate deployment
             sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
@@ -478,6 +569,30 @@
             echo "--------------------------------------------------------"
             echo "Done!"
 
+- builder:
+    name: 'foreman-deploy-virtual'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+
+            # log info to console
+            echo "Starting the virtual deployment using $INSTALLER. This could take some time..."
+            echo "--------------------------------------------------------"
+            echo
+
+            # cleanup baremetal first (in case baremetal was being used on pod2, remove when moved to isolated Virtual pod)
+            sudo $WORKSPACE/common/ci/clean.sh
+
+            # initiate virtual deployment
+            sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -virtual
+
+            echo
+            echo "--------------------------------------------------------"
+            echo "Done!"
+
 - builder:
     name: 'foreman-upload-artifact'
     builders:
@@ -528,4 +643,4 @@
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - pollscm: '0 3 * * *'
+        - pollscm: '0 1 * * *'