diff options
| author | Sangeetha T S <sangeet2@in.ibm.com> | 2016-08-25 00:49:50 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-08-25 02:09:45 -0400 |
| commit | 3bec885b16cda18082dae24d9cd49192dcf8cf69 (patch) | |
| tree | 0392225516f549b5424cd74cad935f6c56a408eb /sbe | |
| parent | 6aedf8b9e6eb2f9ed554134276576d9c12f0c139 (diff) | |
| download | talos-sbe-3bec885b16cda18082dae24d9cd49192dcf8cf69.tar.gz talos-sbe-3bec885b16cda18082dae24d9cd49192dcf8cf69.zip | |
Fetch all pre-reqs during FSP CI for a given patch
Change-Id: I5c461eaf79860bf68011bd12bb65881e108b6995
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28768
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'sbe')
| -rwxr-xr-x | sbe/build/tools/sbeGitTool.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sbe/build/tools/sbeGitTool.pl b/sbe/build/tools/sbeGitTool.pl index 6e23896e..aa7123fd 100755 --- a/sbe/build/tools/sbeGitTool.pl +++ b/sbe/build/tools/sbeGitTool.pl @@ -242,19 +242,20 @@ sub applyRefs print "Cherrypicking reference $ref \n" if $debug; open SBWORKON, " | ./sb workon"; print SBWORKON "git fetch gerrit $ref && echo \"Fetch Done \" > $statusFile \n"; - print SBWORKON "git cherry-pick FETCH_HEAD && echo \"Cherry-pick Done \" >> $statusFile \n"; + #print SBWORKON "git cherry-pick FETCH_HEAD && echo \"Cherry-pick Done \" >> $statusFile \n"; // will be reused once appropriate support is there + print SBWORKON "git checkout FETCH_HEAD && echo \"Checkout Done \" >> $statusFile \n"; print SBWORKON "exit \n"; close SBWORKON; print "\nChecking cherrypick status for $ref...\n" if $debug; my $ch_status = `cat $statusFile`; - if( ($ch_status =~ m/Fetch/) && ($ch_status =~ m/Cherry-pick/)) + if( ($ch_status =~ m/Fetch/) && ($ch_status =~ m/Checkout/)) { - print "Cherry Picking successful\n"; + print "Checkout successful\n"; } else { - die "ERROR: Cherry Picking of $ref failed\n"; + die "ERROR: Checkout of $ref failed\n"; } } } |
