Merge branch 'jiakewei' into 'master'

Jiakewei



See merge request !7

src/org/qg/docker_new/StageBucketTke.groovy

@@ -204,7 +204,7 @@ def check_and_build(buildType,systemName,branchName,contextDir){
 			buildEnv ="java8"
 			break
 		case "python":
-        	buildEnv ="python2"
+        	buildEnv ="python"
         	break
 		case "lua-ui":
 			buildEnv = "node8"
@@ -433,8 +433,8 @@ def prepare_luaui(systemName, contextDir) {
 }
 
 def prepare_python(systemName, contextDir) {
-    //  sh "rm -rf ${contextDir}"
-    sh "cp -rf /home/quant_group/qg-dockerfiles/tke/python2/* ${contextDir}"
+    sh "rm -rf ${contextDir}"
+    sh "cp -rf /home/quant_group/qg-dockerfiles/tke/python/* ${contextDir}"
     sh "cp -rf /home/quant_group/config_repository/python/${systemName}.ini ${contextDir}/config.ini"
 }