X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass4nfv.yml;h=74f9a45399cf75f0f36727d58d19503927d619b4;hb=05daeeb4f90eb5a8ab0a928bc7c9d6414b5c1905;hp=0732d16761b3f0841c172a612c56e31fb0f2869c;hpb=89b6e09c451ce79e27a5aeb1f0cff954fb73cffb;p=releng.git

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 0732d1676..74f9a4539 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -39,8 +39,6 @@
 - job-template:
     name: 'compass-verify'
 
-    project-type: freestyle
-
     disabled: false
 
     node: 'huawei-deploy-vm'
@@ -76,10 +74,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -118,8 +112,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
     node: huawei-build
 
     concurrent: true
@@ -130,12 +122,6 @@
             max-total: 3
             max-per-node: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -150,10 +136,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -173,8 +155,6 @@
 - job-template:
     name: 'compass-daily-{stream}'
 
-    project-type: freestyle
-
     node: huawei-build
 
     concurrent: true
@@ -227,8 +207,6 @@
 - job-template:
     name: 'compass-build-iso'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -267,8 +245,6 @@
 
     description: "build ppa(using docker) in huawei lab"
 
-    project-type: freestyle
-
     node: huawei-build
 
     concurrent: true
@@ -306,8 +282,6 @@
 - job-template:
     name: 'compass-deploy-virtual-{flavor}'
 
-    project-type: freestyle
-
     disabled: false
 
     node: '{node}'
@@ -330,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'
@@ -348,12 +320,9 @@
             allow-empty: 'true'
             fingerprint: true
 
-
 - job-template:
     name: 'compass-deploy-bare-huawei-us'
 
-    project-type: freestyle
-
     disabled: false
 
     node: 'huawei-us-deploy-bare-1'
@@ -389,7 +358,6 @@
             allow-empty: 'true'
             fingerprint: true
 
-
 ########################
 # parameter macros
 ########################
@@ -594,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!"