X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Finfra%2Fbifrost-verify-jobs.yml;h=33032bc7bb6aa8e6d5a82f77d665035bcd043034;hb=d242f8f067a432ff79d7740bc85c95a5b09811ad;hp=b117b32ae32d1a2c420b400f77c96029f3511d13;hpb=22b11a71a3669c4bf1c7a276201b1eb169b019dc;p=releng.git

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index b117b32ae..33032bc7b 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -24,17 +24,20 @@
             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'
 #--------------------------------
 # type
 #--------------------------------
@@ -45,6 +48,17 @@
 #--------------------------------
     jobs:
         - '{project}-bifrost-verify-{distro}-{type}-{stream}'
+
+#--------------------------------
+# VM defaults
+#--------------------------------
+- defaults:
+    name: vm_defaults
+    vm-disk: '30'
+    vm-disk-cache: 'unsafe'
+    vm-memory: '4096'
+    vm-cpu: '2'
+
 #--------------------------------
 # job templates
 #--------------------------------
@@ -53,9 +67,12 @@
 
     disabled: '{obj:disabled}'
 
+    defaults: vm_defaults
+
     concurrent: false
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -81,22 +98,40 @@
         - 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_DISK_CACHE
+            default: '{vm-disk-cache}'
+        - string:
+            name: VM_MEMORY
+            default: '{vm-memory}'
+        - string:
+            name: VM_CPU
+            default: '{vm-cpu}'
         - string:
             name: CLEAN_DIB_IMAGES
             default: 'true'
         - label:
             name: SLAVE_LABEL
             default: 'infra-{type}-{distro}'
+        - string:
+            name: BIFROST_LOG_URL
+            default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
 
     scm:
         - git:
             url: '$PROJECT_REPO'
             refspec: '$GERRIT_REFSPEC'
             branches:
-                - 'origin/$GERRIT_BRANCH'
+                - 'origin/$BRANCH'
             skip-tag: true
             choosing-strategy: 'gerrit'
             timeout: 10
@@ -107,14 +142,12 @@
             branch: '{branch}'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./bifrost-verify.sh
+        - bifrost-set-name
+        - bifrost-build
 
     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
 #--------------------------------
@@ -123,12 +156,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,17 +164,21 @@
                     exclude-no-code-change: 'false'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
+            silent-start: true
             projects:
               - project-compare-type: 'PLAIN'
                 project-pattern: 'openstack/bifrost'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'doc/**'
                   - compare-type: ANT
                     pattern: 'releasenotes/**'
+                disable-strict-forbidden-file-verification: 'true'
             readable-message: true
 - trigger:
     name: 'opnfv-gerrit-trigger'
@@ -164,6 +195,7 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng'
@@ -174,3 +206,18 @@
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
             readable-message: true
+
+#---------------------------
+# builder macros
+#---------------------------
+- builder:
+    name: bifrost-set-name
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+
+- builder:
+    name: bifrost-build
+    builders:
+        - shell:
+            !include-raw: ./bifrost-verify.sh