jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

Рефакторинг

Browse Source
This commit is contained in:
kuzja086
2021-09-08 17:19:38 +05:00
parent f0e72e772e 62521d6fa8
commit aa82bd09ec
11 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
View File

@@ -10,7 +10,7 @@ class JobConfiguration implements Serializable {
@JsonPropertyDescription("Версия платформы 1С:Предприятие в формате 8.3.хх.хххх.") @JsonPropertyDescription("Версия платформы 1С:Предприятие в формате 8.3.хх.хххх.")
String v8version String v8version
@JsonPropertyDescription("Путь к корневому каталогу с исходниками конфигурации") @JsonPropertyDescription("Путь к корневому каталогу с исходниками конфигурации, в случае хранения исходников в формате EDT, необходимо указать путь к проекту")
String srcDir String srcDir
@JsonPropertyDescription("Формат исходников конфигурации") @JsonPropertyDescription("Формат исходников конфигурации")
@@ -64,4 +64,8 @@ class JobConfiguration implements Serializable {
", logosConfig=" + logosConfig + ", logosConfig=" + logosConfig +
'}'; '}';
} }
boolean infobaseFromFiles(){
return sourceFormat.EDT
}
} }

4
src/ru/pulsar/jenkins/library/steps/EdtTransform.groovy → src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
View File

@@ -6,7 +6,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
class EdtTransform implements Serializable { class DesignerToEdtFormatTransformation implements Serializable {
public static final String PROJECT_NAME = 'temp' public static final String PROJECT_NAME = 'temp'
public static final String WORKSPACE = 'build/edt-workspace' public static final String WORKSPACE = 'build/edt-workspace'
@@ -15,7 +15,7 @@ class EdtTransform implements Serializable {
private final JobConfiguration config; private final JobConfiguration config;
EdtTransform(JobConfiguration config) { DesignerToEdtFormatTransformation(JobConfiguration config) {
this.config = config this.config = config
} }

13
src/ru/pulsar/jenkins/library/steps/EdtBackTransform.groovy → src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
View File

@@ -4,18 +4,19 @@ package ru.pulsar.jenkins.library.steps
import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Constants
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
class EdtBackTransform implements Serializable { class EdtToDesignerFormatTransformation implements Serializable {
public static final String WORKSPACE = 'build/workcspace' public static final String WORKSPACE = 'build/edt-workspace'
public static final String CONFIGURATION_DIR = 'build/cfg' public static final String CONFIGURATION_DIR = 'build/cfg'
public static final String CONFIGURATION_ZIP = 'build/cfg.zip' public static final String CONFIGURATION_ZIP = 'build/cfg.zip'
public static final String CONFIGURATION_ZIP_STASH = 'cfg-zip' public static final String CONFIGURATION_ZIP_STASH = 'cfg-zip'
private final JobConfiguration config; private final JobConfiguration config;
EdtBackTransform(JobConfiguration config) { EdtToDesignerFormatTransformation(JobConfiguration config) {
this.config = config this.config = config
} }
@@ -24,8 +25,8 @@ class EdtBackTransform implements Serializable {
Logger.printLocation() Logger.printLocation()
if (!config.stageFlags.srcEDT) { if (!config.sourceFormat.EDT) {
Logger.println("SRC is not EDT format. No transform is needed.") Logger.println("SRC is not in EDT format. No transform is needed.")
return return
} }
@@ -43,7 +44,7 @@ class EdtBackTransform implements Serializable {
def ringCommand = "ring edt workspace export --configuration-files '$configurationRoot' --project $projectDir --workspace-location '$workspaceDir'" def ringCommand = "ring edt workspace export --configuration-files '$configurationRoot' --project $projectDir --workspace-location '$workspaceDir'"
def ringOpts = ['RING_OPTS=-Dfile.encoding=UTF-8 -Dosgi.nl=ru -Duser.language=ru'] def ringOpts =[Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) { steps.withEnv(ringOpts) {
steps.cmd(ringCommand) steps.cmd(ringCommand)
} }

10
src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy
View File

@@ -26,26 +26,26 @@ class EdtValidate implements Serializable {
return return
} }
steps.unstash(EdtTransform.WORKSPACE_ZIP_STASH) steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH)
steps.unzip(EdtTransform.WORKSPACE, EdtTransform.WORKSPACE_ZIP) steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP)
def env = steps.env(); def env = steps.env();
def resultFile = "$env.WORKSPACE/$RESULT_FILE" def resultFile = "$env.WORKSPACE/$RESULT_FILE"
def workspaceLocation = "$env.WORKSPACE/$EdtTransform.WORKSPACE" def workspaceLocation = "$env.WORKSPACE/$DesignerToEdtFormatTransformation.WORKSPACE"
steps.createDir(new File(resultFile).getParent()) steps.createDir(new File(resultFile).getParent())
Logger.println("Выполнение валидации EDT") Logger.println("Выполнение валидации EDT")
def ringCommand = "ring edt workspace validate --workspace-location '$workspaceLocation' --file '$resultFile' --project-name-list $EdtTransform.PROJECT_NAME" def ringCommand = "ring edt workspace validate --workspace-location '$workspaceLocation' --file '$resultFile' --project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME"
def ringOpts = ['RING_OPTS=-Dfile.encoding=UTF-8 -Dosgi.nl=ru -Duser.language=ru'] def ringOpts = ['RING_OPTS=-Dfile.encoding=UTF-8 -Dosgi.nl=ru -Duser.language=ru']
steps.withEnv(ringOpts) { steps.withEnv(ringOpts) {
steps.catchError { steps.catchError {
steps.cmd(ringCommand) steps.cmd(ringCommand)
} }
} }
steps.archiveArtifacts("$EdtTransform.WORKSPACE/.metadata/.log") steps.archiveArtifacts("$DesignerToEdtFormatTransformation.WORKSPACE/.metadata/.log")
steps.archiveArtifacts(RESULT_FILE) steps.archiveArtifacts(RESULT_FILE)
steps.stash(RESULT_STASH, RESULT_FILE) steps.stash(RESULT_STASH, RESULT_FILE)
} }

8
src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy
View File

@@ -18,7 +18,7 @@ class InitFromFiles implements Serializable {
Logger.printLocation() Logger.printLocation()
if (!config.stageFlags.infobaseFromFiles()) { if (!config.infobaseFromFiles()) {
Logger.println("init infoBase from files is disabled") Logger.println("init infoBase from files is disabled")
return return
} }
@@ -27,10 +27,10 @@ class InitFromFiles implements Serializable {
def env = steps.env(); def env = steps.env();
def srcDir = "$env.WORKSPACE/$EdtBackTransform.CONFIGURATION_DIR" def srcDir = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.CONFIGURATION_DIR"
steps.unstash(EdtBackTransform.CONFIGURATION_ZIP_STASH) steps.unstash(EdtToDesignerFormatTransformation.CONFIGURATION_ZIP_STASH)
steps.unzip(srcDir, EdtBackTransform.CONFIGURATION_ZIP) steps.unzip(srcDir, EdtToDesignerFormatTransformation.CONFIGURATION_ZIP)
Logger.println("Выполнение загрузки конфигурации из файлов") Logger.println("Выполнение загрузки конфигурации из файлов")
def initCommand = "oscript_modules/bin/vrunner init-dev --src $srcDir --ibconnection \"/F./build/ib\"" def initCommand = "oscript_modules/bin/vrunner init-dev --src $srcDir --ibconnection \"/F./build/ib\""

11
src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
View File

@@ -9,11 +9,15 @@ import ru.pulsar.jenkins.library.utils.VersionParser
class SonarScanner implements Serializable { class SonarScanner implements Serializable {
private final JobConfiguration config; private final JobConfiguration config;
private String rootFile private final String rootFile
SonarScanner(JobConfiguration config) { SonarScanner(JobConfiguration config) {
this.config = config this.config = config
this.rootFile = "$config.srcDir/Configuration.xml" if (config.sourceFormat.EDT){
this.rootFile = "$config.srcDir/src/Configuration/Configuration.mdo"
} else {
this.rootFile = "$config.srcDir/Configuration.xml"
}
} }
def run() { def run() {
@@ -40,8 +44,7 @@ class SonarScanner implements Serializable {
String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME" String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME"
String configurationVersion = "" String configurationVersion = ""
if (config.stageFlags.srcEDT) { if (config.sourceFormat.EDT) {
rootFile = "$config.srcDir/Configuration/Configuration.mdo"
configurationVersion = VersionParser.edt(rootFile) configurationVersion = VersionParser.edt(rootFile)
}else { }else {
configurationVersion = VersionParser.configuration(rootFile) configurationVersion = VersionParser.configuration(rootFile)

6
src/ru/pulsar/jenkins/library/utils/Constants.groovy Normal file
View File

@@ -0,0 +1,6 @@
package ru.pulsar.jenkins.library.utils
final class Constants {
public static final String DEFAULT_RING_OPTS = "RING_OPTS=-Dfile.encoding=UTF-8 -Dosgi.nl=ru -Duser.language=ru"
}

16
src/ru/pulsar/jenkins/library/utils/VersionParser.groovy
View File

@@ -17,6 +17,14 @@ class VersionParser implements Serializable {
return version(configurationText, VERSION_REGEXP) return version(configurationText, VERSION_REGEXP)
} }
static String edt(rootFile = 'src/Configuration/Configuration.mdo') {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
def configurationText = steps.readFile(rootFile, 'UTF-8');
return version(configurationText, VERSION_REGEXP)
}
static String storage(versionFile = 'src/cf/VERSION') { static String storage(versionFile = 'src/cf/VERSION') {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor() IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
@@ -30,12 +38,4 @@ class VersionParser implements Serializable {
return matcher != null && matcher.getCount() == 1 ? matcher[0][1] : "" return matcher != null && matcher.getCount() == 1 ? matcher[0][1] : ""
} }
static String edt(rootFile = 'src/Configuration/Configuration.mdo') {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
def configurationText = steps.readFile(rootFile, 'UTF-8');
return version(configurationText, VERSION_REGEXP)
}
} }

4
vars/edtTransform.groovy → vars/designerToEdtFormatTransformation.groovy
View File

@@ -1,10 +1,10 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.steps.EdtTransform import ru.pulsar.jenkins.library.steps.DesignerToEdtFormatTransformation
def call(JobConfiguration config) { def call(JobConfiguration config) {
ContextRegistry.registerDefaultContext(this) ContextRegistry.registerDefaultContext(this)
def edtTransform = new EdtTransform(config) def edtTransform = new DesignerToEdtFormatTransformation(config)
edtTransform.run() edtTransform.run()
} }

4
vars/edtBackTransform.groovy → vars/edtToDesignerFormatTransformation.groovy
View File

@@ -1,10 +1,10 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.steps.EdtBackTransform import ru.pulsar.jenkins.library.steps.EdtToDesignerFormatTransformation
def call(JobConfiguration config) { def call(JobConfiguration config) {
ContextRegistry.registerDefaultContext(this) ContextRegistry.registerDefaultContext(this)
def edtBackTransform = new EdtBackTransform(config) def edtBackTransform = new EdtToDesignerFormatTransformation(config)
edtBackTransform.run() edtBackTransform.run()
} }

20
vars/pipeline1C.groovy
View File

@@ -55,31 +55,29 @@ void call() {
} }
when { when {
beforeAgent true beforeAgent true
expression { config.sourceFormat.infobaseFromFiles() } expression { config.infobaseFromFiles() }
} }
steps { steps {
script{ edtToDesignerFormatTransformation config
edtBackTransform config
}
} }
} }
stage('Создание ИБ') { stage('Создание ИБ') {
steps { steps {
script{ printLocation()
printLocation()
installLocalDependencies() installLocalDependencies()
createDir('build/out') createDir('build/out')
if (config.sourceFormat.infobaseFromFiles()){ script {
if (config.infobaseFromFiles()){
// Создание базы загрузкой из файлов // Создание базы загрузкой из файлов
initFromFiles config initFromFiles config
} }
else{ else{
// Создание базы загрузкой конфигурации из хранилища // Создание базы загрузкой конфигурации из хранилища
initFromStorage config initFromStorage config
} }
} }
} }
@@ -114,7 +112,7 @@ void call() {
} }
when { when {
beforeAgent true beforeAgent true
expression { config.stageFlags.edtValidate && !config.stageFlags.srcEDT} expression { config.sourceFormat.DESIGNER && config.stageFlags.edtValidate}
} }
steps { steps {
edtTransform config edtTransform config