X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=42f0afa967b8988bd6f4c7943b7f83cf8884374f;hb=0097178fc74f1a016d9ee76f0692d70eea12a5b1;hp=3bc6b125aa820e2e1f6a363110e94d36b6bcdb48;hpb=a5d5b6ef96411f8c91e3e3b7d96f303bd52755ae;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 3bc6b125a..42f0afa96 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -10,12 +10,14 @@
     installer: 'foreman'
 
     jobs:
-        - 'genesis-foreman-verify-{stream}'
+        - 'genesis-foreman-verify-build-{stream}'
         - '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-verify-deploy-virtual-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -31,7 +33,7 @@
 ########################
 
 - job-template:
-    name: 'genesis-foreman-verify-{stream}'
+    name: 'genesis-foreman-verify-build-{stream}'
 
     project-type: freestyle
 
@@ -42,7 +44,7 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 2
+            max-total: 1
 
     logrotate:
         daysToKeep: 30
@@ -154,7 +156,7 @@
 
     builders:
         - 'foreman-build'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
@@ -174,6 +176,7 @@
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
@@ -192,14 +195,73 @@
             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: 'functest-opnfv-jump-2'
+          - project: 'genesis-foreman-deploy-{stream}'
+            git-revision: true
             block: true
         - trigger-builds:
-          - project: 'yardstick-opnfv-jump-2'
+          - project: 'functest-foreman-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-foreman-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+- 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:
@@ -230,7 +292,7 @@
     builders:
         - 'foreman-build'
         - 'foreman-upload-artifact'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-deploy-{stream}'
@@ -268,7 +330,7 @@
         - 'foreman-deploy'
 
 - job-template:
-    name: 'genesis-foreman-deploy-runner-{stream}'
+    name: 'genesis-foreman-lab-reconfig-{stream}'
 
     project-type: freestyle
 
@@ -299,12 +361,78 @@
             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-verify-deploy-virtual-{stream}'
+
+    project-type: freestyle
+
+    node: opnfv-jump-1
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 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:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'genesis'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'common/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/**'
+            dependency-jobs: 'genesis-foreman-verify-build-{stream}'
+
+
+    builders:
+        - 'foreman-deploy-virtual'
 
 ########################
 # parameter macros
@@ -399,8 +527,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 180 seconds for services to start"
+              sleep 180
             else
               echo "Slave did not come back up after reboot: please check opnfv-jump-2"
               exit 1
@@ -469,7 +597,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 +606,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:
@@ -523,9 +675,9 @@
 - trigger:
     name: 'foreman-master'
     triggers:
-        - pollscm: '0 21 * * *'
+        - timed: '0 11 * * *'
 
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - pollscm: '0 3 * * *'
+        - timed: '0 17 * * *'