krak/jenkins-lib
1
0
Fork 0
forked from jenkins/jenkins-lib
Code Activity

Merge pull request #111 from ivanmolodec/develop

Browse Source 
Добавлен deleteDir() для типа FilePath
This commit is contained in:
Nikita Fedkin
2024-02-20 18:40:20 +01:00
committed by GitHub
parent 1a0b5cb15f c2d9a20e9c
commit 262cd7ac24
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ru/pulsar/jenkins/library/IStepExecutor.groovy
View File

@@ -1,5 +1,6 @@
package ru.pulsar.jenkins.library package ru.pulsar.jenkins.library
import hudson.FilePath
import jenkins.plugins.http_request.HttpMode import jenkins.plugins.http_request.HttpMode
import jenkins.plugins.http_request.MimeType import jenkins.plugins.http_request.MimeType
import jenkins.plugins.http_request.ResponseContentSupplier import jenkins.plugins.http_request.ResponseContentSupplier
@@ -53,6 +54,8 @@ interface IStepExecutor {
void deleteDir(String path) void deleteDir(String path)
void deleteDir(FilePath path)
def withEnv(List<String> strings, Closure body) def withEnv(List<String> strings, Closure body)
def archiveArtifacts(String path) def archiveArtifacts(String path)

8
src/ru/pulsar/jenkins/library/StepExecutor.groovy
View File

@@ -1,5 +1,6 @@
package ru.pulsar.jenkins.library package ru.pulsar.jenkins.library
import hudson.FilePath
import jenkins.plugins.http_request.HttpMode import jenkins.plugins.http_request.HttpMode
import jenkins.plugins.http_request.MimeType import jenkins.plugins.http_request.MimeType
import jenkins.plugins.http_request.ResponseContentSupplier 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 @Override
def withEnv(List<String> strings, Closure body) { def withEnv(List<String> strings, Closure body) {
steps.withEnv(strings) { steps.withEnv(strings) {

2
src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
View File

@@ -39,7 +39,7 @@ class DesignerToEdtFormatTransformation implements Serializable {
def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
def edtVersionForRing = EDT.ringModule(config) def edtVersionForRing = EDT.ringModule(config)
steps.deleteDir(workspaceDir.getRemote()) steps.deleteDir(workspaceDir)
Logger.println("Конвертация исходников из формата конфигуратора в формат EDT") Logger.println("Конвертация исходников из формата конфигуратора в формат EDT")

4
src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
View File

@@ -41,8 +41,8 @@ class EdtToDesignerFormatTransformation implements Serializable {
def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR") def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR")
def edtVersionForRing = EDT.ringModule(config) def edtVersionForRing = EDT.ringModule(config)
steps.deleteDir(workspaceDir.getRemote()) steps.deleteDir(workspaceDir)
steps.deleteDir(configurationRoot.getRemote()) steps.deleteDir(configurationRoot)
Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора") Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")