diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml index db2907f0..6c96a109 100644 --- a/META-INF/plugin.xml +++ b/META-INF/plugin.xml @@ -2,14 +2,14 @@ CloudBees http://www.electric-cloud.com/support Utility - + EC-PluginManager Deploy your complete ElectricFlow DSL file structure to the server help.xml EC-DslDeploy 10 - 3.0.3 + 3.1.0 true CloudBees CD allows you to take a fully code-native approach to continuous delivery and release orchestration using the CloudBees CD Groovy-based DSL. The CloudBees CD model based approach means that every object in CloudBees CD, including release pipelines, deployment automation & strategies, environments, configurations, application models, and more, are all backed by code. diff --git a/dsl/procedures/importDslFromGit/procedure.dsl b/dsl/procedures/importDslFromGit/procedure.dsl index b539ec13..b4827469 100644 --- a/dsl/procedures/importDslFromGit/procedure.dsl +++ b/dsl/procedures/importDslFromGit/procedure.dsl @@ -4,22 +4,37 @@ def procName = 'importDslFromGit' procedure procName, { jobNameTemplate = 'import-dsl-from-git-$[jobId]' - step 'checkoutDsl', - subprocedure: 'CheckoutCode', - subproject:'/plugins/ECSCM-Git/project', - resourceName: '$[rsrcName]', - errorHandling: 'abortProcedure', - actualParameter: [ - clone: '$[clone]', - commit: '$[commit]', - config: '$[config]', - depth: '$[depth]', - dest: '$[dest]', - GitBranch: '$[GitBranch]', - GitRepo: '$[GitRepo]', - overwrite: '$[GitOverwrite]', - tag: '$[tag]' - ] + step 'checkoutDslClone', { + subprocedure = 'Clone' + subproject = '/plugins/EC-Git/project' + resourceName = '$[rsrcName]' + errorHandling = 'abortProcedure' + actualParameter = [ + commit: '$[commit]', + config: '$[config]', + depth: '$[depth]', + repoUrl: '$[GitRepo]', + branch: '$[GitBranch]', + gitRepoFolder: '$[dest]', + overwrite: '$[GitOverwrite]', + tag: '$[tag]' + ] + condition = '$[/javascript myJob.clone == "1" || myJob.clone == "true"]' + } + + step 'checkoutDslPull', { + subprocedure = 'Pull' + subproject = '/plugins/EC-Git/project' + resourceName = '$[rsrcName]' + errorHandling = 'abortProcedure' + actualParameter = [ + config: '$[config]', + branch: '$[GitBranch]', + repoUrl: '$[GitRepo]', + gitRepoFolder: '$[dest]', + ] + condition = '$[/javascript myJob.clone == "0" || myJob.clone == "false"]' + } step 'installFromDirectory', subprocedure: 'installDslFromDirectory', @@ -42,4 +57,4 @@ procedure procName, { resourceName = '$[rsrcName]' shell = 'ec-groovy' } -} \ No newline at end of file +} diff --git a/help/help.adoc b/help/help.adoc index c8a411fe..f55f6ad9 100644 --- a/help/help.adoc +++ b/help/help.adoc @@ -125,6 +125,10 @@ image:cloudbees-common::cd-plugins/ec-dsldeploy/help/importdslfromgit.png[import [[releaseNotes]] == Release notes +=== EC-DslDeploy 3.1.0 + +* The plugin has been switched to use the new plugin EC-Git in place of the old ECSCM-Git. + === EC-DslDeploy 3.0.2 * The documentation has been migrated to the main documentation site.