X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fbuild.sh;h=f1333ce4baf7457fb7a645305175c2089c0baca4;hb=bfa93e78c598696a4f91b431b15ecc6b74f1700b;hp=dd9f9fd12dd34ce2264c37948c32bbe1bfe48b83;hpb=61c08699e3cdfec36633ae869fddbc4f22c32244;p=apex.git

diff --git a/ci/build.sh b/ci/build.sh
index dd9f9fd1..f1333ce4 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -112,27 +112,26 @@ fi
 
 # Conditionally execute RPM build checks if the specs change and target is not rpm or iso
 if [[ "$MAKE_TARGETS" == "images" ]]; then
-    commit_file_list=$(git show --pretty="format:" --name-only)
-    if [[ $commit_file_list == *build/Makefile* ]]; then
+    commit_file_list=$(git show --pretty="format:" --name-status)
+    if git show -s | grep "force-build-rpms"; then
+        MAKE_TARGETS+=" rpms"
+    elif [[ $commit_file_list == *"A$(printf '\t')"* || $commit_file_list == *build/Makefile* ]]; then
         # Makefile forces all rpms to be checked
         MAKE_TARGETS+=" rpms-check"
     else
         # Spec files are selective
-        if [[ $commit_file_list == *build/opnfv-apex-undercloud.spec* ]]; then
+        if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-undercloud.spec* ]]; then
             MAKE_TARGETS+=" undercloud-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex-common.spec* ]]; then
+        if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-common.spec* ]]; then
             MAKE_TARGETS+=" common-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+        if [[ $commit_file_list == *build/rpm_specs/opnfv-apex.spec* ]]; then
             MAKE_TARGETS+=" opendaylight-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex-onos.spec* ]]; then
+        if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-onos.spec* ]]; then
             MAKE_TARGETS+=" onos-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex-opendaylight-sfc.spec* ]]; then
-            MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
-        fi
     fi
 fi