From c2d9a20e9ceb91f93534fee29f8bc533e5e9468e Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Tue, 20 Feb 2024 14:23:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20deleteDir()=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=D0=B0=20FilePath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ru/pulsar/jenkins/library/IStepExecutor.groovy | 3 +++ src/ru/pulsar/jenkins/library/StepExecutor.groovy | 8 ++++++++ .../steps/DesignerToEdtFormatTransformation.groovy | 2 +- .../steps/EdtToDesignerFormatTransformation.groovy | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy index beb4320..4e15fe6 100644 --- a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy @@ -1,5 +1,6 @@ package ru.pulsar.jenkins.library +import hudson.FilePath import jenkins.plugins.http_request.HttpMode import jenkins.plugins.http_request.MimeType import jenkins.plugins.http_request.ResponseContentSupplier @@ -53,6 +54,8 @@ interface IStepExecutor { void deleteDir(String path) + void deleteDir(FilePath path) + def withEnv(List strings, Closure body) def archiveArtifacts(String path) diff --git a/src/ru/pulsar/jenkins/library/StepExecutor.groovy b/src/ru/pulsar/jenkins/library/StepExecutor.groovy index b58b494..59030cf 100644 --- a/src/ru/pulsar/jenkins/library/StepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/StepExecutor.groovy @@ -1,5 +1,6 @@ package ru.pulsar.jenkins.library +import hudson.FilePath import jenkins.plugins.http_request.HttpMode import jenkins.plugins.http_request.MimeType import jenkins.plugins.http_request.ResponseContentSupplier @@ -119,6 +120,13 @@ class StepExecutor implements IStepExecutor { } } + @Override + void deleteDir(FilePath path) { + steps.dir(path.getRemote()) { + steps.deleteDir() + } + } + @Override def withEnv(List strings, Closure body) { steps.withEnv(strings) { diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy index 1f32eca..8ff0073 100644 --- a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy @@ -39,7 +39,7 @@ class DesignerToEdtFormatTransformation implements Serializable { def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def edtVersionForRing = EDT.ringModule(config) - steps.deleteDir(workspaceDir.getRemote()) + steps.deleteDir(workspaceDir) Logger.println("Конвертация исходников из формата конфигуратора в формат EDT") diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy index 498f4ff..f80acf2 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy @@ -41,8 +41,8 @@ class EdtToDesignerFormatTransformation implements Serializable { def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR") def edtVersionForRing = EDT.ringModule(config) - steps.deleteDir(workspaceDir.getRemote()) - steps.deleteDir(configurationRoot.getRemote()) + steps.deleteDir(workspaceDir) + steps.deleteDir(configurationRoot) Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")