diff options
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/citest/auto-release | 2 | ||||
| -rwxr-xr-x | src/build/tools/hbRelease | 34 |
2 files changed, 23 insertions, 13 deletions
diff --git a/src/build/citest/auto-release b/src/build/citest/auto-release index 544f9273f..9cbac262e 100755 --- a/src/build/citest/auto-release +++ b/src/build/citest/auto-release @@ -62,7 +62,7 @@ function build { ### Push tag to gerrit, create track and checkin files git push ssh://hostboot-us@gerrit-server/hostboot $RELEASE_NAME || exit -1 git checkout gerrit/master || exit -1 - hbRelease pre-release --level $RELEASE_NAME --release $FIPS_RELEASE --checkInDir $CMVC_DIR --released $PREVIOUS_RELEASE|| exit -1 + hbRelease pre-release --level $RELEASE_NAME --release $FIPS_RELEASE --checkInDir $CMVC_DIR --released $PREVIOUS_RELEASE --track $EXISTING_TRACK || exit -1 # Check if feature was successfully created and if so set $FEATURE if [ -f $CMVC_FEATURE_FILE ]; then FEATURE=`cat $CMVC_FEATURE_FILE`; diff --git a/src/build/tools/hbRelease b/src/build/tools/hbRelease index 7c3c1e555..a67a98883 100755 --- a/src/build/tools/hbRelease +++ b/src/build/tools/hbRelease @@ -413,11 +413,13 @@ sub execute_pre_release my $level = ""; my $checkInDir = ""; my $released = ""; + my $track = ""; GetOptions("release:s" => \$release); GetOptions("level:s" => \$level); GetOptions("checkInDir:s" => \$checkInDir); GetOptions("released:s" => \$released); + GetOptions("track:s" => \$track); die "Missing release" if ($release eq ""); die "Missing level" if ($level eq ""); @@ -430,21 +432,29 @@ sub execute_pre_release $CMVC_FILES .= "src/hbfw/img/hostboot_securerom.bin "; } - # CMVC open feature - my $open_feature = "Feature -open -component $globals{component}"; - $open_feature .= " -remarks \"Hostboot Release - $level\" -verbose"; - # Get the Feature number from the output, should be the only numbers. - my $feature = run_system_command($open_feature); - $feature =~ s/[^0-9]//g; - # CMVC assign feature - run_system_command("Feature -assign $feature -owner $globals{cmvcUser} -verbose"); + if($track eq "") + { + # CMVC open feature + my $open_feature = "Feature -open -component $globals{component}"; + $open_feature .= " -remarks \"Hostboot Release - $level\" -verbose"; + # Get the Feature number from the output, should be the only numbers. + my $feature = run_system_command($open_feature); + $feature =~ s/[^0-9]//g; + + # CMVC assign feature + run_system_command("Feature -assign $feature -owner $globals{cmvcUser} -verbose"); - # CMVC accept feature - run_system_command("Feature -accept $feature -verbose"); + # CMVC accept feature + run_system_command("Feature -accept $feature -verbose"); - # CMVC create track - run_system_command("Track -create -release $release -feature $feature -verbose"); + # CMVC create track + run_system_command("Track -create -release $release -feature $feature -verbose"); + } + else + { + $feature = $track; + } # Add in cmvc coReqs and cmvc preReqs execute_cmvc_reqs($feature,$level,$released,$release); |
