Merge branch 'master' of git.quantgroup.cn:QA/global-jenkinsfile

src/org/qg/ci/StageBucket.groovy

+// src/org/foo/Stage.groovy
+package org.qg.ci;
+import org.qg.docker_new.Utils;
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurperClassic;
+
+def _utils() { 
+	return new org.qg.docker_new.Utils();
+}
+
+
+def sonaar_check(){
+	_utils().beautyEcho("sonar check +++", "info")
+    /*
+    sonarScanner = "/home/quant_group/jenkins_home/tools/hudson.plugins.sonar.SonarRunnerInstallation/sonar/bin/sonar-scanner"
+    currentPath = sh (script: 'pwd',returnStdout: true).trim()
+    git branch: "${GIT_BRANCH}", credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: "${GIT_PEPO_SSH_URL}"
+
+    sh "${sonarScanner} -e \
+    -Dsonar.host.url=http://172.30.3.42:9000  \
+    -Dsonar.projectVersion=${GIT_BRANCH} \
+    -Dsonar.projectKey=${GIT_BRANCH} \
+    -Dsonar.java.binaries=. \
+    -Dsonar.sources=. \
+    -Dsonar.projectBaseDir=${currentPath}"
+    */
+
+}
+
+def callback_pipes(info) {
+    
+	sleep 3
+	sonarInfo = sh (script: 'cat .sonar/report-task.txt |awk \'{printf $0 "&"}\'',returnStdout: true).trim()
+	items = sonarInfo.split("&")
+	
+	def content=[:]
+	for (def item : items){
+		itemSplit = item.split("=",2)
+		content[itemSplit[0]] =itemSplit[1]
+
+	}
+	println JsonOutput.toJson(content)
+	
+	/*callbackData = "${sonarReportTask}pipelineEntityId=aaa&taskNum=1"
+	echo "==========================="
+	echo  callbackData
+	echo "==========================="
+	// def props = new Properties()
+	// props.load(sonarReportTask)
+
+	sh "curl --data ${callbackData} http://mock.q-gp.com"*/
+}
+
+

src/org/qg/docker_new/StageBucket.groovy

@@ -115,8 +115,9 @@ def checkout(buildType,systemName, branchName) {
 			break
 	}
 	
-	def brahHashCode = sh (script: 'git log -1 --pretty=%h',returnStdout: true).trim()
-	echo "brahHashCode:${brahHashCode}   with 'git log -1 --pretty=%h'"
+	def brahHashCode = sh (script: 'git log -1 --pretty=%H',returnStdout: true).trim()
+	brahHashCode = brahHashCode.substring(0,16)
+	echo "brahHashCode:${brahHashCode}   with 'git log -1 --pretty=%H'"
 	return brahHashCode
 	
 }
@@ -281,15 +282,17 @@ def build_nodejs( systemName, contextDir) {
     configName = systemName
         
     sh "mv -f env.config.js ${configPath}"
-    sh 'tar zcf dist.tgz ./*'
-    sh "mv dist.tgz ${contextDir}"
+    sh "tar zcf ${contextDir}/dist.tgz ./* "
+
 }
 
 def build_python( systemName, contextDir) {
     sh "cp -rf ${contextDir}/config.ini server/config/release/config.ini"
     sh "cp -rf ${contextDir}/config.ini server/config/beta/config.ini"
-    sh 'tar zcf dist.tgz server/'
-    sh "mv dist.tgz ${contextDir}"
+    sh "tar zcf ${contextDir}/dist.tgz server/"
+    
+/*	    sh "mv dist.tgz ${contextDir}"*/
+
 }
 
 def build_luaui( systemName, contextDir) {   

vars/qgAnsiblePipeline.groovy

@@ -41,7 +41,7 @@ def call(body) {
             }
         }
 				}else{
-					sh "ansible-playbook k8s-deploy.yml -e project_name=${projectName} -e data_center=${dataCenter} -e env=${envType} -e image=${image} -v"
+					sh "ansible-playbook /etc/ansible/k8s-deploy.yml -e project_name=${projectName} -e data_center=${dataCenter} -e env=${envType} -e image=${image} -v"
 				}
     }
 }

vars/qgCiSonar.groovy

+def call(body) {
+	def _stage = new org.qg.ci.StageBucket()
+	def _utils = new org.qg.docker_new.Utils()
+	def env = body.env
+	def GIT_PEPO_SSH_URL = env.GIT_PEPO_SSH_URL
+	def GIT_REPO_NAME = env.GIT_REPO_NAME
+	def GIT_BRANCH = env.GIT_BRANCH
+	def GIT_BRANCH_HASH = env.GIT_BRANCH_HASH
+	def GIT_TRIGER_USER = env.GIT_TRIGER_USER
+	def PIPELINE_ID = env.PIPELINE_ID
+	def STAGE_INDEX = env.STAGE_INDEX
+	def TASK_INDEX = env.TASK_INDEX
+	
+	def info = [
+	pipline_id : PIPELINE_ID,
+	stage_index: STAGE_INDEX,
+	task_index: TASK_INDEX,
+	context:[]
+	]
+	
+	/*body.resolveStrategy = Closure.DELEGATE_FIRST
+	body.delegate = config
+	body()*/
+	
+	ansiColor('xterm') {
+echo "\033[32m############################################\n\
+#  GIT_PEPO_SSH_URL:${GIT_PEPO_SSH_URL}\n\
+#  GIT_REPO_NAME:${GIT_REPO_NAME}\n\
+#  GIT_BRANCH:${GIT_BRANCH}\n\
+#  GIT_BRANCH_HASH:${GIT_BRANCH_HASH}\n\
+#  GIT_TRIGER_USER:${GIT_TRIGER_USER}\n\
+############################################\033[0m"
+	}
+	
+		node{
+			dir(GIT_REPO_NAME){
+			    stage("SonarQube Quality Gate"){
+					def gitRepoName ="${GIT_REPO_NAME}"
+   
+			    }
+				stage("callback"){
+					_stage.callback_pipes(info)
+           
+				}
+			}
+		}
+		    
+	
+}
+
+
+
+