support grepo update logic

Author: tw-kang

CTP/common/script/start_consumer.sh

@@ -139,6 +139,18 @@ function updateCodes()
 { 
     curDir=`pwd`
     branchName=$1
+    
+    # Check branch change and remove cache if needed
+    branchMarkerFile="${CTP_HOME}/.dailyqa/.current_branch"
+    if [ -f "$branchMarkerFile" ]; then
+        currentBranch=`cat $branchMarkerFile`
+        if [ "$currentBranch" != "$branchName" ]; then
+            localBranchName=`echo $branchName|sed 's#/#_#g'`
+            cacheFile="${CTP_HOME}/.dailyqa/cubrid-testtools_${localBranchName}_CTP.zip"
+            [ -f "$cacheFile" ] && rm -f "$cacheFile" && echo "Branch changed: $currentBranch -> $branchName (cache removed)"
+        fi
+    fi
+    
     changedCount=`cd ${CTP_HOME}; run_grepo_fetch -r cubrid-testtools -b "$branchName" -p "CTP" -e "conf" --check-only . | grep "fetch" | grep CHANGED | wc -l`
 
     if [ "$changedCount" -gt "0" ]
@@ -369,20 +381,26 @@ do
 		then
 			echo "Action: $x, ${q_exec[$count]}.sh, CONTINUE"
 			# Update CTP if ENV_CTP_BRANCH_NAME is set in continue mode
+			tempBranchContinue=""
 			if [ $withoutSync -ne 1 ]
 			then
 				source ${CTP_HOME}/common/sched/init.sh $ser_site
 				if [ "$CTP_BRANCH_NAME" ] && [ "$CTP_BRANCH_NAME" != "$branchName" ]
 				then
 					echo "ENV_CTP_BRANCH_NAME detected: $CTP_BRANCH_NAME (updating from $branchName)"
 					updateCodes $CTP_BRANCH_NAME
+					tempBranchContinue="$branchName"
 				fi
 			fi
 			(cd ${CTP_HOME}; export BUILD_IS_FROM_GIT=$isFromGit ;source ${CTP_HOME}/common/sched/init.sh $ser_site;sh common/ext/${q_exec[$count]}.sh YES)
 
 			echo
             echo "End continue mode test!"
 			consumerTimer ${existsMsgId} "stop"
+			
+			# Restore original branch if temp branch was used
+			[ -n "$tempBranchContinue" ] && updateCodes $tempBranchContinue
+			
 			contimeENDTIME=`getTimeStamp`
 			echo "END_CONTINUE_TIME:${contimeENDTIME}"
 			echo '' > ${CTP_HOME}/common/sched/status/${x}
@@ -393,13 +411,15 @@ do
 		hasTestBuild
 
 		#update client again if ENV_CTP_BRANCH_NAME is set in message
+		tempBranch=""
 		if [ "$hasBuild" == "true" ] && [ $withoutSync -ne 1 ]
 		then
 			source ${CTP_HOME}/common/sched/init.sh $ser_site
 			if [ "$CTP_BRANCH_NAME" ] && [ "$CTP_BRANCH_NAME" != "$branchName" ]
 			then
 				echo "ENV_CTP_BRANCH_NAME detected: $CTP_BRANCH_NAME (updating from $branchName)"
 				updateCodes $CTP_BRANCH_NAME
+				tempBranch="$branchName"
 			fi
 		fi
 
@@ -440,6 +460,9 @@ do
 
 				consumerTimer $msgId "stop"
 
+				# Restore original branch if temp branch was used
+				[ -n "$tempBranch" ] && updateCodes $tempBranch
+
 				ENDTIME=`getTimeStamp`
 				echo 
 				echo "Clean msg id from queue file"

CTP/common/script/upgrade.sh

@@ -47,4 +47,4 @@ mkdir -p ../.ctp
 cp -rf common/lib/* ../.ctp/
 
 export `grep -E "^grepo_service_url" conf/common.conf | tr -d '\r'`
-"$JAVA_HOME/bin/java" -cp ../.ctp/cubridqa-common.jar com.navercorp.cubridqa.common.grepo.UpgradeMain -r cubrid-testtools -b "$branchName" -p "CTP" -e "conf" .; (chmod u+x ./bin/*; chmod u+x ./common/script/*; chmod u+x ./common/ext/*; chmod u+x sql/bin/*; rm -rf ../.ctp >/dev/null 3>&1); echo DONE; cd "${current_user_dir}"; exit
+"$JAVA_HOME/bin/java" -cp ../.ctp/cubridqa-common.jar com.navercorp.cubridqa.common.grepo.UpgradeMain -r cubrid-testtools -b "$branchName" -p "CTP" -e "conf" .; (chmod u+x ./bin/*; chmod u+x ./common/script/*; chmod u+x ./common/ext/*; chmod u+x sql/bin/*; mkdir -p ${dest_tool_dir}/.dailyqa; echo "$branchName" > ${dest_tool_dir}/.dailyqa/.current_branch; rm -rf ../.ctp >/dev/null 3>&1); echo DONE; cd "${current_user_dir}"; exit