Enable merge job to build image relevant to change

Change-Id: I719d0b98dd9893948c25a1e56fe59b290fcee950
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bc556cf82a015bfe0c4d2c90f0e1264063caa328..0174685302a97d1eb021df84e2baa538fe6cca48 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -434,7 +434,9 @@
 
     scm:
         - gerrit-trigger-scm:
-            refspec: ''
+            refspec: '$GERRIT_REFSPEC'
+            branches:
+                - '$GERRIT_BRANCH'
             choosing-strategy: 'default'
 
     wrappers:
@@ -457,7 +459,17 @@
                       branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
-                      pattern: 'packer/**'
+                      pattern: 'packer/vars/{platforms}.json'
+                    - compare-type: ANT
+                      pattern: 'packer/template/{templates}.json'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/{templates}.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/system_reseal.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/rh-user_data.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/devstack-pre-pip.sh'
 
     builders:
         - packer-validate:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 37425b47fd2fe0c16b163f3e49fe8e7d0f5b1c31..95bd6ea9b95651f281297bc3129316adf35cf362 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -483,9 +483,14 @@
                 /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
             done
 
+
 - builder:
     name: packer-build
     builders:
+        - config-file-provider:
+            files:
+                - file-id: 'packer-cloud-env'
+                  variable: 'CLOUDENV'
         - shell: |
             cd packer
             export PACKER_LOG="yes" && \