Skip to content

Commit

Permalink
Added cmvcCheckinForceFlag to break links for new releases
Browse files Browse the repository at this point in the history
Change-Id: Ia0cc1e8af43972c81f44c337e51b3108ceb15362
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55217
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
Sameer Veer authored and dcrowell77 committed Mar 8, 2018
1 parent fdbf715 commit 2ae2bff
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions src/build/tools/hbRelease
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,16 @@ sub execute_pre_release
my $checkInDir = "";
my $released = "";
my $track = "";
#
#Pass $cmvcCheckinForceFlag from Jenkins to check in files w/ '-force' option
#within CMVC to break the file links

my $cmvcCheckinForceFlag = "";

if ( $ENV{CMVC_CHECKIN_FORCEFLAG} eq "-force" )
{
$cmvcCheckinForceFlag = "$ENV{CMVC_CHECKIN_FORCEFLAG}";
}

GetOptions("release:s" => \$release);
GetOptions("level:s" => \$level);
Expand Down Expand Up @@ -481,7 +491,7 @@ sub execute_pre_release

#Check In Files
chdir ($checkInDir);
run_system_command("File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose");
run_system_command("File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose $cmvcCheckinForceFlag");

my $featureFile = $ENV{CMVC_FEATURE_FILE};
open(CMVC_FEATURE,">",$featureFile)
Expand Down Expand Up @@ -634,6 +644,16 @@ sub execute_checkinBuildToTrack
my $release = "";
my $checkInDir = "";
my $released = "";
#
#Pass $cmvcCheckinForceFlag from Jenkins to check in files w/ '-force' option
#within CMVC to break the file links

my $cmvcCheckinForceFlag = "";

if ( $ENV{CMVC_CHECKIN_FORCEFLAG} eq "-force" )
{
$cmvcCheckinForceFlag = "$ENV{CMVC_CHECKIN_FORCEFLAG}";
}

GetOptions("level:s" => \$level);
GetOptions("release:s" => \$release);
Expand Down Expand Up @@ -677,8 +697,8 @@ sub execute_checkinBuildToTrack
print "Switching directory to \"$checkInDir\" .....\n";
chdir ($checkInDir);
run_system_command("pwd");
print "#####-> run_system_command(\"File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose\")\n";
run_system_command("File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose");
print "#####-> run_system_command(\"File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose $cmvcCheckinForceFlag\")\n";
run_system_command("File -checkin $CMVC_FILES -top $checkInDir -release $release -feature $feature -verbose $cmvcCheckinForceFlag");

#Complete Fix Records
print "#####-> run_system_command(\"Fix -complete -feature $feature -release $release -component esw_hbfw -verbose\")\n";
Expand Down

0 comments on commit 2ae2bff

Please sign in to comment.