X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfra%2Fbifrost-verify-jobs.yml;h=d595d4bef60f94ef1f70217aad399047a6f43ee2;hb=982a7eb030bfe91ba4cb8fa5c976b5f4cad7f621;hp=6232859eef245d3b861577927a86076fe61f4929;hpb=d48d8be23dd95b4ceaf12561d5eef08fd7907806;p=releng.git

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index 6232859ee..d595d4bef 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -38,9 +38,6 @@
             dib-os-element: 'opensuse-minimal'
             dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
-            vm-disk: '30'
-            vm-memory: '4096'
-            vm-cpu: '2'
 #--------------------------------
 # type
 #--------------------------------
@@ -57,9 +54,10 @@
 #--------------------------------
 - defaults:
     name: vm_defaults
-    vm-disk: '100'
-    vm-memory: '8192'
-    vm-cpu: '4'
+    vm-disk: '30'
+    vm-disk-cache: 'unsafe'
+    vm-memory: '4096'
+    vm-cpu: '2'
 
 #--------------------------------
 # job templates
@@ -74,6 +72,7 @@
     concurrent: false
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -108,6 +107,9 @@
         - string:
             name: VM_DISK
             default: '{vm-disk}'
+        - string:
+            name: VM_DISK_CACHE
+            default: '{vm-disk-cache}'
         - string:
             name: VM_MEMORY
             default: '{vm-memory}'
@@ -129,7 +131,7 @@
             url: '$PROJECT_REPO'
             refspec: '$GERRIT_REFSPEC'
             branches:
-                - 'origin/$GERRIT_BRANCH'
+                - 'origin/$BRANCH'
             skip-tag: true
             choosing-strategy: 'gerrit'
             timeout: 10
@@ -142,11 +144,10 @@
     builders:
         - bifrost-set-name
         - bifrost-build
-        - bifrost-artifacts-upload
 
     publishers:
         - email:
-            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
+            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
 #--------------------------------
 # trigger macros
 #--------------------------------
@@ -202,8 +203,6 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
-                  - compare-type: ANT
-                    pattern: 'jjb/infra/**'
             readable-message: true
 
 #---------------------------
@@ -220,9 +219,3 @@
     builders:
         - shell:
             !include-raw: ./bifrost-verify.sh
-
-- builder:
-    name: bifrost-artifacts-upload
-    builders:
-        - shell:
-            !include-raw: ./bifrost-upload-logs.sh