X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=6d1c5b147c85b4e7b0eda50e073d5f23f3b905fa;hb=4ca2feb5e8c2e1a15ee96eea64c06dad5083b681;hp=8553bcff99908df2804ff73495a5fec27f41237e;hpb=90384095dba59ec8efcb0a576bc3522b66020cb2;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 8553bcff9..6d1c5b147 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -11,10 +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)
@@ -41,7 +44,7 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 2
+            max-total: 1
 
     logrotate:
         daysToKeep: 30
@@ -93,9 +96,10 @@
 
     builders:
         - 'foreman-build'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-foreman-merge'
+    name: 'genesis-foreman-merge-{stream}'
 
     project-type: freestyle
 
@@ -118,7 +122,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: ''
@@ -143,7 +147,7 @@
                 project-pattern: 'genesis'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'common/**'
@@ -152,6 +156,7 @@
 
     builders:
         - 'foreman-build'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
@@ -171,6 +176,7 @@
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
@@ -188,6 +194,10 @@
           - project: 'genesis-foreman-build-{stream}'
             git-revision: true
             block: true
+        - trigger-builds:
+          - project: 'genesis-foreman-lab-reconfig-{stream}'
+            git-revision: true
+            block: true
         - trigger-builds:
           - project: 'genesis-foreman-deploy-{stream}'
             git-revision: true
@@ -199,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}'
 
@@ -227,6 +284,7 @@
     builders:
         - 'foreman-build'
         - 'foreman-upload-artifact'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-deploy-{stream}'
@@ -263,6 +321,111 @@
     builders:
         - 'foreman-deploy'
 
+- job-template:
+    name: 'genesis-foreman-lab-reconfig-{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.*"
+
+    builders:
+        - 'foreman-lab-reconfig'
+
+- job-template:
+    name: 'genesis-foreman-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-{stream}'
+
+
+    builders:
+        - 'foreman-deploy-virtual'
+
 ########################
 # parameter macros
 ########################
@@ -293,6 +456,83 @@
 ########################
 # builder macros
 ########################
+- builder:
+    name: 'foreman-lab-reconfig'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+
+            # check to see if ucs login info file exists
+            if [ -e ~/.ssh/ucs_creds ];then
+              source ~/.ssh/ucs_creds
+            else
+              echo "Unable to find UCS credentials for LF lab reconfiguration...Exiting"
+              exit 1
+            fi
+
+            # clone releng
+            echo "Cloning releng repo..."
+            if ! GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/releng; then
+              echo "Unable to clone releng repo...Exiting"
+              exit 1
+            fi
+
+            # log info to console
+            echo "Starting the lab reconfiguration for $INSTALLER..."
+            echo "--------------------------------------------------------"
+            echo
+
+            # create venv
+            $WORKSPACE/releng/utils/lab-reconfiguration/create_venv.sh
+
+            # disable nounset because 'activate' script contains unbound variable(s)
+            set +o nounset
+            # enter venv
+            source $WORKSPACE/releng/utils/lab-reconfiguration/venv/bin/activate
+            # set nounset back again
+            set -o nounset
+
+            # verify we are in venv
+            if [[ ! $(which python | grep venv) ]]; then
+              echo "Unable to activate venv...Exiting"
+              exit 1
+            fi
+
+            python $WORKSPACE/releng/utils/lab-reconfiguration/reconfigUcsNet.py -i $ucs_host -u $ucs_user -p $ucs_password -f $WORKSPACE/releng/utils/lab-reconfiguration/foreman.yaml
+
+            # while undergoing reboot
+            sleep 30
+
+            # check to see if slave is back up
+            ping_counter=0
+            ping_flag=0
+            while [ "$ping_counter" -lt 20 ]; do
+              if [[ $(ping -c 5 172.30.10.72) ]]; then
+                ping_flag=1
+                break
+              fi
+              ((ping_counter++))
+              sleep 10
+            done
+
+            if [ "$ping_flag" -eq 1 ]; then
+              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
+            fi
+
+            set +o nounset
+            deactivate
+
+            echo
+            echo "--------------------------------------------------------"
+            echo "Done!"
+
 - builder:
     name: 'foreman-build'
     builders:
@@ -349,7 +589,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
@@ -358,6 +598,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:
@@ -408,4 +672,4 @@
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - pollscm: '0 3 * * *'
+        - pollscm: '0 1 * * *'