From 03257b19a87b9ec0fd5602e239a5123b41117594 Mon Sep 17 00:00:00 2001
From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Tue, 10 May 2016 14:09:46 +0100
Subject: ovsnfv: Remove some paths from gerrit ci

The current ci/build.sh script in ovsnfv only verifies changes to some
paths. For paths that it does not check do not run the ci. It is planned
to cover the currently unverified paths with a separate ci script.

Change-Id: I62071b8c9697e3c6fcb3f6d63e2c00404f3c5594
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
---
 jjb/ovsnfv/ovsnfv.yml | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'jjb')

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 6f6d29012..dbe0a25fa 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -54,16 +54,14 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'ci/**'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            cd $WORKSPACE/ci
-            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-merge-{stream}'
@@ -100,18 +98,16 @@
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'ci/**'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            cd $WORKSPACE/ci
-            ./build.sh
+        - build-rpms
 
 - job-template:
     name: 'ovsnfv-daily-{stream}'
@@ -139,6 +135,15 @@
     triggers:
         - timed: '@midnight'
 
+    builders:
+        - build-rpms
+
+    publishers:
+        - email:
+            recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
+
+- builder:
+    name: build-rpms
     builders:
         - shell: |
             #!/bin/bash
@@ -148,7 +153,3 @@
 
             cd $WORKSPACE/ci
             ./build.sh
-
-    publishers:
-        - email:
-            recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
-- 
cgit 1.2.3-korg