ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -132,47 +132,11 @@ def checkout_nodejs(systemName, branchName) {
     
 }
 
-def checkout_luaui(systemNames, branchNames) {
+def checkout_luaui(systemName, branchNames) {
 	  
 	sh "cp -rf /home/quant_group/config_repository/lua-ui/npmrc/npmrc /root/.npmrc"
-    if(systemNames.contains("--")){
-				_utils().beautyEcho("complex ui projects : ${systemNames}"  , "info")
-        t1 = systemNames.split("/")
    
-        projects = t1[1].split("--")
-        branches = branchNames.split("--")
-
-        t1.size().times {
-
-            dir (projects[it]) {
-                projectAttr = project_attr(projects[it])
-                gitPath = projectAttr["gitPath"]
-                
-								currentPath = sh (
-									script: 'pwd',
-									returnStdout: true
-								).trim()
-    
-                def folder = new File( "${currentPath}/.git/hooks" )
-                if( !folder.exists() ) {
-                    git branch: branches[it], credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
-                    
-                    def bowerFile = fileExists './bower.json'
-
-                    if (bowerFile) {
-                        sh "bower install --allow-root"
-                    }
-                    sh "npm install"
-                }else{
-                    sh "\\cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
-                    sh "chmod +x .git/hooks/post-merge"
-                    git branch: branches[it], credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
-                }
-            }
-        }
-    }
-    else{
-				_utils().beautyEcho("simple ui project : ${systemNames}"  , "info")
+	_utils().beautyEcho("ui project : ${systemNames}"  , "info")
 	def systemName = systemNames
 	def  branchName = branchNames
 
@@ -198,7 +162,6 @@ def checkout_luaui(systemNames, branchNames) {
 	sh "npm install"           
         
     
-    }
 }
 
 def build(buildType,systemName, contextDir){
@@ -252,24 +215,16 @@ def build_python( systemName, contextDir) {
     sh "mv dist.tgz ${contextDir}"
 }
 
-def build_luaui( systemNames, contextDir) {
-    arrSystem = systemNames.split("--")
-    for (systemName in arrSystem) {
-        dir (systemName) {
+def build_luaui( systemName, contextDir) {    
 	def res_json = project_attr(systemName)
-
 	configPath = res_json["configPath"]
 	buildCmd = res_json["buildCmd"]
 	configName = systemName
-
 	sh "mv -f ../${systemName}.env.config.js ${configPath}"
-            
 	sh buildCmd
-            
 	sh "tar zcf ${systemName}.tgz dist/"
 	sh "mv ${systemName}.tgz ../${contextDir}"
-        }
-    }
+     
 }
 
 def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {