diff --git a/vars/addVersionFromNexusRepo.groovy b/vars/addVersionFromNexusRepo.groovy index da6d986..21b17c0 100644 --- a/vars/addVersionFromNexusRepo.groovy +++ b/vars/addVersionFromNexusRepo.groovy @@ -12,11 +12,11 @@ Jenkins Plugin dependencies: */ // Define the enum -enum Flags { +enum BuildNumFlags { - BUILDNUM_IS_COMMITS_SINCE_TAG, - BUILDNUM_IS_JOB_NUMBER, - BUILDNUM_IS_FROM_QUERY + IS_COMMITS_SINCE_TAG, + IS_JOB_BUILD_NUMBER, + IS_FROM_QUERY } @@ -24,7 +24,7 @@ Map call(Map config = [:]) { Map defaults = [ nexusBase: 'https://repo.thejimnicholson.com', searchAPI: 'service/rest/v1/search', - build_flag: Flags.BUILDNUM_IS_FROM_QUERY, + build_flag: BuildNumFlags.IS_FROM_QUERY, queryParams: [ 'repository': 'tools', 'sort': 'name', @@ -51,16 +51,16 @@ Map call(Map config = [:]) { query_build = matches[2] } switch (build_flag) { - case Flags.BUILDNUM_IS_COMMITS_SINCE_TAG: + case BuildNumFlags.IS_COMMITS_SINCE_TAG: build = sh( script: 'git rev-list $(git tag | tail -1).. --count', returnStdout: true ).trim() break - case Flags.BUILDNUM_IS_JOB_NUMBER: + case BuildNumFlags.IS_JOB_BUILD_NUMBER: build = env.BUILD_NUMBER break - case Flags.BUILDNUM_IS_FROM_QUERY: + case BuildNumFlags.IS_FROM_QUERY: build = query_build break default: