From 16885554b1d1738670e8039beb9177ceb7788065 Mon Sep 17 00:00:00 2001 From: "Manda, Tanuj" Date: Tue, 19 Sep 2017 11:40:35 -0400 Subject: [PATCH] made changes so that it supports pluggable-scm --- .../jobs/dsl/environment_provisioning.groovy | 29 ++++---------- .../java_reference_application_jobs.groovy | 39 ++++--------------- 2 files changed, 16 insertions(+), 52 deletions(-) diff --git a/jenkins/jobs/dsl/environment_provisioning.groovy b/jenkins/jobs/dsl/environment_provisioning.groovy index 9fd24cb..77c9e48 100644 --- a/jenkins/jobs/dsl/environment_provisioning.groovy +++ b/jenkins/jobs/dsl/environment_provisioning.groovy @@ -1,9 +1,14 @@ +import pluggable.scm.*; + +SCMProvider scmProvider = SCMProviderHandler.getScmProvider("${SCM_PROVIDER_ID}", binding.variables) + // Folders def workspaceFolderName = "${WORKSPACE_NAME}" def projectFolderName = "${PROJECT_NAME}" +def projectScmNamespace = "${SCM_NAMESPACE}" // Variables -def environmentTemplateGitUrl = "ssh://jenkins@gerrit:29418/${PROJECT_NAME}/adop-cartridge-java-environment-template" +def environmentTemplateGitUrl = "adop-cartridge-java-environment-template" // Jobs def environmentProvisioningPipelineView = buildPipelineView(projectFolderName + "/Environment_Provisioning") @@ -74,16 +79,7 @@ The reference application deploy job is expecting the default environment to be |docker exec proxy /usr/sbin/nginx -s reload |set -x'''.stripMargin()) } - scm { - git { - remote { - name("origin") - url("${environmentTemplateGitUrl}") - credentials("adop-jenkins-master") - } - branch("*/master") - } - } + scm scmProvider.get(projectScmNamespace, environmentTemplateGitUrl, "*/master", "pluggable-scm", null) publishers { buildPipelineTrigger("${PROJECT_NAME}/Destroy_Environment") { parameters { @@ -104,16 +100,7 @@ destroyEnvironmentJob.with{ env('WORKSPACE_NAME',workspaceFolderName) env('PROJECT_NAME',projectFolderName) } - scm { - git { - remote { - name("origin") - url("${environmentTemplateGitUrl}") - credentials("adop-jenkins-master") - } - branch("*/master") - } - } + scm scmProvider.get(projectScmNamespace, environmentTemplateGitUrl, "*/master", "pluggable-scm", null) wrappers { preBuildCleanup() injectPasswords() diff --git a/jenkins/jobs/dsl/java_reference_application_jobs.groovy b/jenkins/jobs/dsl/java_reference_application_jobs.groovy index 63cd989..011a397 100644 --- a/jenkins/jobs/dsl/java_reference_application_jobs.groovy +++ b/jenkins/jobs/dsl/java_reference_application_jobs.groovy @@ -1,13 +1,16 @@ +import pluggable.scm.*; + +SCMProvider scmProvider = SCMProviderHandler.getScmProvider("${SCM_PROVIDER_ID}", binding.variables) + // Folders def workspaceFolderName = "${WORKSPACE_NAME}" def projectFolderName = "${PROJECT_NAME}" +def projectScmNamespace = "${SCM_NAMESPACE}" // Variables def projectNameKey = projectFolderName.toLowerCase().replace("/", "-") def referenceAppgitRepo = "spring-petclinic" def regressionTestGitRepo = "adop-cartridge-java-regression-tests" -def referenceAppGitUrl = "ssh://jenkins@gerrit:29418/${PROJECT_NAME}/" + referenceAppgitRepo -def regressionTestGitUrl = "ssh://jenkins@gerrit:29418/${PROJECT_NAME}/" + regressionTestGitRepo // Jobs def buildAppJob = freeStyleJob(projectFolderName + "/Reference_Application_Build") @@ -39,31 +42,13 @@ buildAppJob.with { maskPasswords() sshAgent("adop-jenkins-master") } - scm { - git { - remote { - url(referenceAppGitUrl) - credentials("adop-jenkins-master") - } - branch("*/master") - } - } + scm scmProvider.get(projectScmNamespace, referenceAppgitRepo, "*/master", "pluggable-scm", null) environmentVariables { env('WORKSPACE_NAME', workspaceFolderName) env('PROJECT_NAME', projectFolderName) } label("java8") - triggers { - gerrit { - events { - refUpdated() - } - project(projectFolderName + '/' + referenceAppgitRepo, 'plain:master') - configure { node -> - node / serverName("ADOP Gerrit") - } - } - } + triggers scmProvider.trigger(projectScmNamespace, referenceAppgitRepo, "master") steps { maven { goals('clean install -DskipTests') @@ -250,15 +235,7 @@ regressionTestJob.with { stringParam("PARENT_BUILD", "Reference_Application_Build", "Parent build name") stringParam("ENVIRONMENT_NAME", "CI", "Name of the environment.") } - scm { - git { - remote { - url(regressionTestGitUrl) - credentials("adop-jenkins-master") - } - branch("*/master") - } - } + scm scmProvider.get(projectScmNamespace, regressionTestGitRepo, "*/master", "pluggable-scm", null) wrappers { preBuildCleanup() injectPasswords()