Add 2nd query to hbRelease script finding commits in release-fips920

  - A lot of the underlying logic assumes a one branch per FSP
    release stream concept. This is no longer true for
    release-fips920. If the query to release-fips920 fails a 2nd
    query will be performed to the master branch.

  - This should only be temporary as the real change is worked

Change-Id: Ibf8650f3d761444e2b51b61376a9d74c5e3097df
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59737
Reviewed-by: Sameer R. Veer <sveer@us.ibm.com>
Tested-by: Sameer R. Veer <sveer@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/src/build/tools/hbRelease b/src/build/tools/hbRelease
index 8f0d67cf7..898c2bbac 100755
--- a/src/build/tools/hbRelease
+++ b/src/build/tools/hbRelease
@@ -2137,6 +2137,7 @@ sub gerrit_query_commit
 
     my $project = config_project();
 
+
     my $query_result = gerrit_query("$commit project:$project ".
                                     "branch:".$globals{"branch"});
     foreach my $result (@{$query_result})
@@ -2159,7 +2160,19 @@ sub gerrit_query_commit
         }
     }
 
-    die "Cannot find $commit in $project/$globals{\"branch\"}";
+    #Temporary Hack to look for commit in master branch if not found in
+    # release-fips920
+    if (($project eq "hostboot") and $globals{"branch"} eq "release-fips920")
+    {
+        print "Cannot find $commit in $project/$globals{\"branch\"} \n" if $debug;
+        # Force next iteration to look for master branch
+        $globals{"branch"}="master";
+        gerrit_query_commit($commit);
+    }
+    else
+    {
+        die "Cannot find $commit in $project/$globals{\"branch\"}";
+    }
 }
 
 # sub gerrit_is_patch