2012091123PM-Source Control Steps

2019 - procedure

1 ade ci -all   ;   ade savetrans

2 ade refreshview -latest

3 Run premerge:

$ADE_VIEW_ROOT/fatools/opensource/jauditFixScripts/FinPreMerge/bin/fin_premerge.ksh -d fusion/fusion@slcac355.us.oracle.com:1550/ems2429 -Dfamily=fin -DupdateBug=Y

4 orareview -u -n -r haiye,echua,strussel,hongysun,vcooper,ddouglas,sgottipa,dhandley,leliang,joniu,strussel,rbsinha,ttagawa,aryang,vcooper,mariwood,yazpan

5 Summit Merge Request

mergereq -y -m MIWAMOTO -r hcmrel (V1RUP4HCM)  [hcmdevap(V1RUP4DEV)]

6 After Release team approved:
ade beginmerge

ade mergetrans

ade endmerge

7 Delete the non-using trans

ade lstrans | grep NONE | awk '{print "ade destroytrans -force -purge "  $1}'>purge_ade.sh
chmod 777 purge_ade.sh
./purge_ade.sh

 

Prerequisites:

1 ade savetrans

2 orareview -u -n -r haiye,echua,strussel,hongysun,vcooper,ddouglas,sgottipa,dhandley,leliang,joniu,strussel,rbsinha,ttagawa,aryang,vcooper,mariwood,yazpan

#3 Seprate GSCC check
perl /usr/local/packages/isd/bin/gscccli mergereq_check --txn_name joniu_bug-13993760 --output_file /home/joniu/temp/gscc_joniu_bug-13993760.txt

4 ade cleanview

################### no more used #######################

MVT check
source /ade_autofs/ade_fusion_linux/FATOOLS_MAIN_LINUX.rdd/LATEST/fatools/opensource/utilities/mvt/bin/hcm_cshrc
mvt

New Procedure:

1 Bug validation

/net/ap6043fses.us.oracle.com/scratch/hcmrel/bin/hcmbugvalidation joniu_bug-13993760

2 Pre-merge checker

$ADE_VIEW_ROOT/fatools/opensource/jauditFixScripts/FinPreMerge/bin/fin_premerge.ksh -d fusion/fusion@slcac737.us.oracle.com:1599/h02yb560 -Dfamily=hcm -DupdateBug=Y

3 FPR                                     

/usr/local/packages/fre/bin/fpr -e h02yb560 -s joniu_bug-13993760 -p V_CONT_EQUIV=NO
/usr/local/packages/fre/bin/fpr -e cdrdrup -s currenttransaction

h02yb560 and cdrdrup are recommended environment.

-p V_CONT_EQUIV=NO is force mode. All files will be validated again. 

Then Go to this page to check FPR result:

 http://fre.us.oracle.com:7777/cgi-bin/fprScheduler?scope=env&req=home

#4 Build whole applications

If you modified .jws file (eg: /ade/joniu_RUP4_Sup/fusionapps/hcm/components/hcmPayroll/HcmPayroll.jws), you need to run a full build of the whole application.

ant -f $HCM_TOP/build-pay.xml clean build ear > build.log

In the build.log file , there must not have any " fail* ". So just search for it.

5 Update your bug with bug validation link, FPR link (build.log files,if nessary) to your bug.

6 Summit Merge Request

mergereq -y -m MIWAMOTO -r hcmrel (V1RUP4HCM)  [hcmdevap(V1RUP4DEV)]

Find the approver in  https://kix.oraclecorp.com/KIX/display.php?articleId=323827

7 After Release team approved:

ade beginmerge

ade mergetrans

NOTE: A log of the mergetrans was written to:
/net/adc1006nap.us.oracle.com/vol/fade_adc_txn/joniu/joniu_bug-13993760/joniu_bug-13993760.merge_log
Report of merge diffs going to /net/adc1006nap.us.oracle.com/vol/fade_adc_txn/joniu/joniu_bug-13993760/joniu_bug-13993760.merge_diffs
Please check it!

ade endmerge

Delete the non-using trans

ade lstrans | grep NONE | awk '{print "ade destroytrans -force -purge "  $1}'>purge_ade.sh
chmod 777 purge_ade.sh
./purge_ade.sh

=============================================

Resolve Conflict Step:

If there are some conflicts ,you need to resolve them manually.

Instructions:
-       ade useview cgoh_r7int_r_18310_v -noenv
-       farm project -lsconflicts
-       ade merge -remerge
        -       This will open a GUI window to resolve conflicts
-       farm project -mark resolved -filename
        -       Use the above command to mark file 'resolved'
-       farm project -lsconflicts -unresolved
        -       Run the above command and ensure all of your conflicts are resolved (no longer in the list)

See detail info in https://kix.oraclecorp.com/KIX/display.php?labelId=9436&articleId=308456 

###################### Scrach Space Check ##########

[joniu@ap6030fses joniu_RUP4_super fusionapps] /home/acockbur/share/chk_disk_space.pl
Checking disk space for joniu . .
ADE TRX storage . .
ADE Transactions: 98M   /net/adc1006nap.us.oracle.com/vol/fade_adc_txn//joniu
ADE view storage . .
ADE Views: 9.2G /net/adc1006nap.us.oracle.com/vol/fade_adc_txn/.fusionapps_view_storage//joniu
IDE storage .
IDE storage: 4.1G       /net/adc1006nap.us.oracle.com/vol/fade_adc_txn/.fusionapps_ide/FMWTOOLS_11.1.1.6.0_GENERIC_120112.0037.2_PATCHES4FA_11.1.1.6.2_PLATFORMS/joniu
3.9G    /net/adc1006nap.us.oracle.com/vol/fade_adc_txn/.fusionapps_ide/FMWTOOLS_11.1.1.6.0_GENERIC_120112.0037.2_PATCHES4FA_11.1.1.6.1_PLATFORMS/joniu

Checking for TRASH File  . .Trash dirs: 351M    .

##################################################