From e9c1d7c4b4c398452d768349a1831958cba813c1 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Fri, 22 Nov 2019 16:58:18 -0500 Subject: [PATCH] Pass image to function --- Jenkinsfile | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df8a350..2886d8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,39 +18,7 @@ pipeline { //Runs versioning in docker container stage('Self Version') { steps { - script - { - - def docker_image = docker.image("${DOCKER_REGISTRY}/auto-semver:${SELF_SEMVER_TAG}") - docker_image.inside{ - - def RETURN_STATUS - def regex = '^\\s*current_version\\s*=\\s*\\K[^\\s]+' - env.SEMVER_OLD_VERSION = sh(script: "grep -Po '${regex}' .bumpversion.cfg", returnStdout: true).trim() - - RETURN_STATUS = sh(script: "semver -n", returnStatus: true) - echo "Semver Return Status: ${RETURN_STATUS}" - env.SEMVER_STATUS = RETURN_STATUS - switch (RETURN_STATUS) { - case "0": - echo 'Versioned will push after build/test.' - break - case "128": - echo 'Unknown Semver Failure' - sh 'exit 1' - break - default: - echo 'No versioning required.' - break - } - - env.SEMVER_NEW_VERSION = sh(script: "grep -Po '${regex}' .bumpversion.cfg", returnStdout: true).trim() - env.SEMVER_RESOLVED_VERSION = getVersion('-d') - - env.VERSION = getVersion('-d') - - } - } + runAutoSemver("${DOCKER_REGISTRY}/auto-semver:${SELF_SEMVER_TAG}") } post{ // Update Git with status of version stage.