From 5f618132b41bbf2ad55aa75ebecd5e370263008f Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 22 Nov 2021 15:01:27 +0800
Subject: [PATCH] 测试

---
 Jenkinsfile |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b3d2fef..761a411 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,20 +2,7 @@
 @Library('utils')_
 pipeline {
     agent { label '103' }
-    triggers {
-        GenericTrigger(
-         genericVariables: [
-          [key: 'ref', value: '$.ref']
-         ],
-         causeString: 'Triggered on $ref',
-         tokenCredentialId: '6abafc9e-1f0e-4d27-8389-7c81d69bcdb2',
-         printContributedVariables: true,
-         printPostContent: true,
-         silentResponse: false,
-         regexpFilterText: '$ref',
-         regexpFilterExpression: 'refs/heads/' + BRANCH_NAME
-        )
-    }
+
     environment {
             project_name = 'git_study'
             url = 'http://47.92.145.232:8998/r/git_study.git'
@@ -24,7 +11,7 @@
     options {
         //给日志加上时间错, 需安装 Timestamper 插件
         timestamps()
-
+        ansiColor('xterm')
     }
     stages {
         stage('source') {
@@ -41,12 +28,16 @@
         }
         stage('test') {
             steps {
-                sh 'echo test'
+                sh 'echo ${GIT_BRANCH}'
+                test("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
             }
         }
         stage('version add') {
             when {
                 allOf {
+                    not {
+                        branch 'master'
+                    }
                     anyOf {
                         changeset "**/*.js"
                         changeset "**/*.css"
@@ -60,11 +51,13 @@
                     }
                 }
             }
-//             steps {
-//                 versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
-//             }
+            steps{
+                echo "todo add version"
+            }
+
         }
         stage('deploy') {
+            when { branch 'master' }
             steps {
                 sh 'echo test'
             }

--
Gitblit v1.9.1