X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfra%2Fbifrost-verify-jobs.yml;h=baf33ea3a7386c9b85935d76570f2b5222d6fe16;hb=fd8eedf2222fef2fc4529aa5e6065741e36c5374;hp=17796a8324498552502460b3eec68371175a2b50;hpb=a366d65ccaca3c1aa8fdc9e396d708b623dda014;p=releng.git

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index 17796a832..baf33ea3a 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -24,17 +24,23 @@
             disabled: false
             dib-os-release: 'trusty'
             dib-os-element: 'ubuntu-minimal'
-            dib-os-packages: 'openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+            dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+            extra-dib-elements: 'openssh-server'
         - 'centos7':
             disabled: false
             dib-os-release: '7'
-            dib-os-element: 'centos-minimal'
-            dib-os-packages: 'openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl'
+            dib-os-element: 'centos7'
+            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+            extra-dib-elements: 'openssh-server'
         - 'suse':
-            disabled: true
-            dib-os-release: 'suse'
-            dib-os-element: 'suse'
-            dib-os-packages: ''
+            disabled: false
+            dib-os-release: '42.2'
+            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
 #--------------------------------
@@ -45,6 +51,16 @@
 #--------------------------------
     jobs:
         - '{project}-bifrost-verify-{distro}-{type}-{stream}'
+
+#--------------------------------
+# VM defaults
+#--------------------------------
+- defaults:
+    name: vm_defaults
+    vm-disk: '100'
+    vm-memory: '8192'
+    vm-cpu: '4'
+
 #--------------------------------
 # job templates
 #--------------------------------
@@ -53,6 +69,8 @@
 
     disabled: '{obj:disabled}'
 
+    defaults: vm_defaults
+
     concurrent: false
 
     properties:
@@ -81,9 +99,21 @@
         - string:
             name: DIB_OS_ELEMENT
             default: '{dib-os-element}'
+        - string:
+            name: EXTRA_DIB_ELEMENTS
+            default: '{extra-dib-elements}'
         - string:
             name: DIB_OS_PACKAGES
             default: '{dib-os-packages}'
+        - string:
+            name: VM_DISK
+            default: '{vm-disk}'
+        - string:
+            name: VM_MEMORY
+            default: '{vm-memory}'
+        - string:
+            name: VM_CPU
+            default: '{vm-cpu}'
         - string:
             name: CLEAN_DIB_IMAGES
             default: 'true'
@@ -102,10 +132,6 @@
             timeout: 10
             wipe-workspace: true
 
-    triggers:
-        - '{project}-gerrit-trigger':
-            branch: '{branch}'
-
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
@@ -123,12 +149,6 @@
     triggers:
         - gerrit:
             server-name: 'review.openstack.org'
-            silent-start: true
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
             escape-quotes: true
             trigger-on:
                 - patchset-created-event:
@@ -137,6 +157,8 @@
                     exclude-no-code-change: 'false'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
+            custom-url: '* $JOB_NAME $BUILD_URL'
+            silent-start: true
             projects:
               - project-compare-type: 'PLAIN'
                 project-pattern: 'openstack/bifrost'