Merge "remove test_cases info in project description"

[releng.git] / jjb / compass4nfv / compass4nfv.yml

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 3159cfa..74f9a45 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -39,12 +39,18 @@
 - job-template:
     name: 'compass-verify'
 
-    project-type: freestyle
-
     disabled: false
 
     node: 'huawei-deploy-vm'
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 1
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -68,10 +74,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -110,15 +112,15 @@
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
     node: huawei-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 1
 
     parameters:
         - project-parameter:
@@ -134,10 +136,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -157,10 +155,16 @@
 - job-template:
     name: 'compass-daily-{stream}'
 
-    project-type: freestyle
-
     node: huawei-build
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -191,10 +195,10 @@
           - 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
@@ -203,9 +207,15 @@
 - job-template:
     name: 'compass-build-iso'
 
-    project-type: freestyle
+    node: ericsson-build
 
-    node: huawei-build
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
 
     logrotate:
         daysToKeep: 30
@@ -235,10 +245,16 @@
 
     description: "build ppa(using docker) in huawei lab"
 
-    project-type: freestyle
-
     node: huawei-build
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -266,12 +282,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 +304,12 @@
             default: '{conf}'
             description: ""
 
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
-
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'
@@ -300,16 +320,21 @@
             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}'
@@ -333,7 +358,6 @@
             allow-empty: 'true'
             fingerprint: true
 
-
 ########################
 # parameter macros
 ########################
@@ -366,10 +390,10 @@
             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/"
@@ -496,6 +520,9 @@
 
             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
 
             ./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
@@ -535,7 +562,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!"