X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass4nfv.yml;h=3ef252fdc35ed5750dc23e3dff346112818c82c7;hb=refs%2Fchanges%2F31%2F4631%2F2;hp=3159cfa072600517e87dbcba64716025cfd214e6;hpb=37a4beacd198f7c797babb0210e5152e228077ae;p=releng.git

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 3159cfa07..3ef252fdc 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -1,4 +1,3 @@
-# this is the job configuration for bgs
 - project:
 
     name: compass
@@ -6,19 +5,21 @@
     installer: 'compass'
 
     jobs:
-        - 'compass-verify'
-        - 'compass-merge'
+        - 'compass-verify-{stream}'
         - 'compass-daily-{stream}'
-        - 'compass-build-iso'
-        - 'compass-build-ppa'
+        - 'compass-build-iso-{stream}'
+        - 'compass-build-ppa-{stream}'
         - 'compass-deploy-virtual-{flavor}'
         - 'compass-deploy-bare-huawei-us'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
     flavor:
         - cluster-odl:
@@ -37,25 +38,25 @@
 # job templates
 ########################
 - job-template:
-    name: 'compass-verify'
-
-    project-type: freestyle
+    name: 'compass-verify-{stream}'
 
     disabled: false
 
     node: 'huawei-deploy-vm'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 1
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - compass-parameter:
             installer: '{installer}'
         - string:
@@ -68,10 +69,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -89,10 +86,10 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'docs/**'
+                    pattern: 'docs/**|.gitignore'
 
     builders:
         - 'builder-compass-build-iso'
@@ -104,62 +101,17 @@
             fingerprint: true
 
 - job-template:
-    name: 'compass-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    project-type: freestyle
+    name: 'compass-daily-{stream}'
 
     node: huawei-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-        - compass-parameter:
-            installer: '{installer}'
+    concurrent: true
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - 'builder-compass-merge'
-
-- job-template:
-    name: 'compass-daily-{stream}'
-
-    project-type: freestyle
-
-    node: huawei-build
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
 
     parameters:
         - project-parameter:
@@ -176,12 +128,6 @@
     triggers:
         - timed: '@midnight'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'compass-build-iso'
@@ -191,27 +137,27 @@
           - project: 'compass-deploy-virtual-cluster'
             git-revision: true
             block: true
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-cluster-odl'
-            git-revision: true
-            block: true
+#        - trigger-builds:
+#          - project: 'compass-deploy-virtual-cluster-odl'
+#            git-revision: true
+#            block: true
         - trigger-builds:
           - project: 'compass-deploy-virtual-cluster-onos'
             git-revision: true
             block: true
 
 - job-template:
-    name: 'compass-build-iso'
+    name: 'compass-build-iso-{stream}'
 
-    project-type: freestyle
+    node: ericsson-build
 
-    node: huawei-build
+    concurrent: true
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
 
     parameters:
         - project-parameter:
@@ -223,7 +169,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     builders:
         - 'builder-compass-build-iso'
@@ -231,19 +177,19 @@
         - 'builder-compass-workspace-cleanup'
 
 - job-template:
-    name: 'compass-build-ppa'
+    name: 'compass-build-ppa-{stream}'
 
     description: "build ppa(using docker) in huawei lab"
 
-    project-type: freestyle
-
     node: huawei-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
 
     parameters:
         - project-parameter:
@@ -255,7 +201,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     triggers:
         - timed: 'H 16 * * *'
@@ -266,12 +212,18 @@
 - job-template:
     name: 'compass-deploy-virtual-{flavor}'
 
-    project-type: freestyle
-
     disabled: false
 
     node: '{node}'
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -282,14 +234,6 @@
             default: '{conf}'
             description: ""
 
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'
@@ -300,28 +244,27 @@
             allow-empty: 'true'
             fingerprint: true
 
-
 - job-template:
     name: 'compass-deploy-bare-huawei-us'
 
-    project-type: freestyle
-
     disabled: false
 
     node: 'huawei-us-deploy-bare-1'
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     parameters:
         - project-parameter:
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'
@@ -333,7 +276,6 @@
             allow-empty: 'true'
             fingerprint: true
 
-
 ########################
 # parameter macros
 ########################
@@ -366,24 +308,27 @@
             description: "URL to Google Storage proxy"
         - string:
             name: installer_ip
-            default: "10.1.0.12"
+            default: "192.168.200.2"
         - string:
             name: PPA_REPO
-            default: "http://58.251.166.184:9999"
+            default: "http://205.177.226.235:9999"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
+        - choice:
+            name: COMPASS-OPENSTACK-VERSION
+            choices:
+                - 'liberty'
+                - 'juno'
+        - choice:
+            name: COMPASS-OS-VERSION
+            choices:
+                - 'ubuntu-trusty'
+                - 'rhel7'
 
 ########################
 # builder macros
 ########################
-- builder:
-    name: 'builder-compass-merge'
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Hello World!"
-
 - builder:
     name: 'builder-compass-make-ppa'
     builders:
@@ -465,6 +410,9 @@
             echo
 
             export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+            sudo brctl addbr vnic_ci
+            sudo ifconfig vnic_ci up
+            export EXTERNAL_NIC=vnic_ci
             cd $WORKSPACE
 
             ./deploy.sh $FLAVOR_CONF
@@ -496,8 +444,13 @@
 
             export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1
             export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+            export EXTERNAL_NIC=eth0
+            export INSTALL_NIC=eth1
+
             cd $WORKSPACE
 
+            export OS_VERSION=${COMPASS-OS-VERSION}
+            export OPENSTACK_VERSION=${COMPASS-OPENSTACK-VERSION}
             ./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
@@ -509,7 +462,7 @@
             echo "Done!"
 
             ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_juno-opnfv2/ansible.log ./  &> /dev/null
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS-OPENSTACK-VERSION}-opnfv2/ansible.log ./  &> /dev/null
 
             exit $deploy_ret
 
@@ -535,7 +488,6 @@
             gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
             gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1
 
-
             echo
             echo "--------------------------------------------------------"
             echo "Done!"