Revert CUBRIDQA-1314 changes (from 45cba4d to 40d5b94) for bug fix

This reverts commits 45cba4d through 40d5b94 (CUBRIDQA-1314 related changes).
These changes will be reapplied after fixing bugs.

Reverted commits:
- 40d5b94 Deploy new build artifacts refer to 2182de3
- 2182de3 [CUBRIDQA-1314] support grepo update logic and isoltion test worker node CTP update. (#743)
- 637ec59 [CUBRIDQA-1314] use dynamic path for CTP/conf/common.conf (#741)
- 245b1b6 Deploy new build artifacts refer to 9dda3b8
- 9dda3b8 [CUBRIDQA-1314] add ENV_ keyword on manualtest job sender module. (#739)
- 71b08bf Deploy new build artifacts refer to 45cba4d
- 45cba4d [CUBRIDQA-1314] add new environment accept function for ENV keyword (#733)

Author: tw-kang

CTP/cdc_repl/lib/cubridqa-cdc_repl.jar

@@ -112,7 +112,6 @@ private boolean installCUBRID() throws Exception {
 		boolean isSucc = true;
 		String role = context.getProperty(ConfigParameterConstants.CUBRID_INSTALL_ROLE, "").trim();
 		GeneralScriptInput scripts = new GeneralScriptInput();
-		scripts.addCommand(CommonUtils.getExportsOfENVParams());
 		scripts.addCommand("chmod u+x ${CTP_HOME}/common/script/run_cubrid_install");
 		scripts.addCommand("run_cubrid_install " + role + " " + context.getCubridPackageUrl() + " " + context.getProperty(ConfigParameterConstants.CUBRID_ADDITIONAL_DOWNLOAD_URL, "").trim() + " 2>&1");
 

CTP/cdc_repl/src/com/navercorp/cubridqa/cdc_repl/deploy/DeployNode.java

@@ -36,11 +36,6 @@ function analyzeMessageInfo() {
 		BUILD_SVN_BRANCH=$BUILD_SVN_BRANCH_NEW
 		export BUILD_SVN_BRANCH
 	 fi
-	 
-	# Process ENV_ prefixed variables (ENV_CTP_BRANCH_NAME -> export CTP_BRANCH_NAME)
-	for env_var in `cat $result | grep "^ENV_" | sed "s/:/=/" | sed "s/^ENV_//"`; do
-		eval "export $env_var"
-	done
 
     if [ "$SVR_SITE" == 'china' ]
     then
@@ -103,15 +98,15 @@ function check_local_disk_space () {
     )
 }
 
-export DAILYQA_DAILYSRV_HOST=`ini.sh ${CTP_HOME}/conf/common.conf qahome_server_host`
-export DAILYQA_DAILYSRV_USER=`ini.sh ${CTP_HOME}/conf/common.conf qahome_server_user`
-export DAILYQA_DAILYSRV_PWD=`ini.sh ${CTP_HOME}/conf/common.conf qahome_server_pwd`
-export DAILYQA_DAILYSRV_PORT=`ini.sh ${CTP_HOME}/conf/common.conf qahome_server_port`
-export DAILYQA_GIT_USER=`ini.sh ${CTP_HOME}/conf/common.conf git_user`
-export DAILYQA_GIT_PWD=`ini.sh ${CTP_HOME}/conf/common.conf git_pwd`
-export DAILYQA_GIT_EMAIL=`ini.sh ${CTP_HOME}/conf/common.conf git_email`
-export DAILYQA_SSH_PWD_DEFAULT=`ini.sh ${CTP_HOME}/conf/common.conf default_ssh_pwd`
-export DAILYQA_SSH_PORT_DEFAULT=`ini.sh ${CTP_HOME}/conf/common.conf default_ssh_port`
+export DAILYQA_DAILYSRV_HOST=`ini.sh conf/common.conf qahome_server_host`
+export DAILYQA_DAILYSRV_USER=`ini.sh conf/common.conf qahome_server_user`
+export DAILYQA_DAILYSRV_PWD=`ini.sh conf/common.conf qahome_server_pwd`
+export DAILYQA_DAILYSRV_PORT=`ini.sh conf/common.conf qahome_server_port`
+export DAILYQA_GIT_USER=`ini.sh conf/common.conf git_user`
+export DAILYQA_GIT_PWD=`ini.sh conf/common.conf git_pwd`
+export DAILYQA_GIT_EMAIL=`ini.sh conf/common.conf git_email`
+export DAILYQA_SSH_PWD_DEFAULT=`ini.sh conf/common.conf default_ssh_pwd`
+export DAILYQA_SSH_PORT_DEFAULT=`ini.sh conf/common.conf default_ssh_port`
 
 analyzeMessageInfo $1
 export -f getMsgValue

CTP/common/lib/cubridqa-common.jar

@@ -325,7 +325,7 @@ private static boolean acceptConfirm() throws IOException {
 
 	private static void showHelp() {
 		System.out
-				.println("Usage: java com.navercorp.cubridqa.scheduler.producer.ManualSender <queue> <url1,url2,...> <scenario> <priority> [compat_file|-i18nAll|-dbimgAll|-compatAll] [PROPS:MKEY_TEST1=v1;MKEY_TEST2=v2|ENV_TEST1=v1;ENV_TEST2=v2]");
+				.println("Usage: java com.navercorp.cubridqa.scheduler.producer.ManualSender <queue> <url1,url2,...> <scenario> <priority> [compat_file|-i18nAll|-dbimgAll|-compatAll] [PROPS:MKEY_TEST1=v1;MKEY_TEST2=v2]");
 		System.out.println();
 	}
 

CTP/common/sched/init.sh

@@ -193,7 +193,7 @@ private boolean processTest(CUBJobContext jctx, File buildRootFile, Properties t
 		while (it.hasNext()) {
 			key = it.next().trim();
 			value = testProps.getProperty(key);
-			if (key.startsWith("MKEY_") || key.startsWith("ENV_")) {
+			if (key.startsWith("MKEY_")) {
 				msgProps.put(key, value);
 			}
 		}

CTP/common/sched/lib/cubridqa-scheduler.jar

@@ -139,18 +139,6 @@ 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" ]
@@ -172,7 +160,6 @@ function updateCodes()
 	    echo "then " >> $HOME/.autoUpdate.sh
 	    echo "	  . ~/.bash_profile " >> $HOME/.autoUpdate.sh
 	    echo "fi " >> $HOME/.autoUpdate.sh
-	    echo "export CTP_BRANCH_NAME=$branchName" >> $HOME/.autoUpdate.sh
 	    echo "set -x " >> $HOME/.autoUpdate.sh
 	    echo "cd ${CURRENT_TOOL_HOME}/../script ">> $HOME/.autoUpdate.sh
 	    echo "chmod u+x *">> $HOME/.autoUpdate.sh
@@ -380,27 +367,11 @@ do
 		if [ "$existsMsgId" -a  ${isStartByData} -gt 0 ]
 		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}
@@ -409,20 +380,6 @@ do
 
 		startAgent $x 
 		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
-		
 		if [ "$isDebug" == "--debug" ]
 		then
 			echo "-------------------------- Debug Message Information -----------------------------"
@@ -460,9 +417,6 @@ 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/sched/src/com/navercorp/cubridqa/scheduler/producer/ManualSender.java

@@ -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/*; 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
+"$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

CTP/common/sched/src/com/navercorp/cubridqa/scheduler/producer/crontab/CUBJob.java

@@ -361,25 +361,6 @@ public static String getExportsOfMEKYParams() {
 		return result.toString();
 	}
 
-	public static String getExportsOfENVParams() {
-		Map<String, String> map = System.getenv();
-
-		Set<Map.Entry<String, String>> entries = map.entrySet();
-		StringBuffer result = new StringBuffer();
-
-		String key, value;
-		for (Map.Entry<String, String> entry : entries) {
-			key = entry.getKey().trim();
-			value = entry.getValue();
-
-			// Export CTP related variables that were set by ENV_ prefix
-			if ((key.startsWith("CTP_") || key.equals("BUILD_SCENARIO_BRANCH_GIT")) && value != null) {
-				result.append("export ").append(key).append("=\"").append(value).append("\";");
-			}
-		}
-		return result.toString();
-	}
-
 	public static String getEnvInFile(String var) {
 		String value = System.getenv(var);