use scm checkout object

f852ede0 · LinuxSuRen · 32d148ef · f852ede0
隐藏空白更改
内联并排

Showing with 10 addition and 4 deletion

Jenkinsfile Jenkinsfile +10 -4

未找到文件。
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,9 @@ pipeline {
        stage("clone") {
            steps {
                dir(FOLDER) {
-                    scmObj = checkout scm
+                    script {
+                        scmObj = checkout scm
+                    }
                }
            }
        }
@@ -37,7 +39,7 @@ pipeline {

        stage("image") {
            environment {
-                IMAGE_TAG = scmObj.GIT_COMMIT
+                IMAGE_TAG = getCurrentCommit(scmObj)
            }
            steps {
                container('tools'){
@@ -53,7 +55,7 @@ pipeline {
        stage("push-image") {
            environment {
                DOCKER_CREDS = credentials('docker-surenpi')
-                IMAGE_TAG = scmObj.GIT_COMMIT
+                IMAGE_TAG = getCurrentCommit(scmObj)
            }
            steps {
                container('tools') {
@@ -66,4 +68,8 @@ pipeline {
            }
        }
    }
-}
\ No newline at end of file
+}
+
+def getCurrentCommit(scmObj) {
+    return scmObj.GIT_COMMIT
+}