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

Merge branch 'develop' into FromEDTTransform

Browse Source
This commit is contained in:
Nikita Gryzlov
2021-11-01 13:42:58 +03:00
parent aa82bd09ec 191388763f
commit b351c5232e
11 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vars/initFromStorage.groovy
View File

@@ -1,4 +1,5 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.utils.VRunner
import ru.pulsar.jenkins.library.utils.VersionParser
def call(JobConfiguration jobConfiguration) {
@@ -17,6 +18,7 @@ def call(JobConfiguration jobConfiguration) {
variable: 'STORAGE_PATH'
)
]) {
cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW $storageVersionParameter --ibconnection \"/F./build/ib\""
String vrunnerPath = VRunner.getVRunnerPath();
cmd "$vrunnerPath init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW $storageVersionParameter --ibconnection \"/F./build/ib\""
}
}

7
vars/installLocalDependencies.groovy
View File

@@ -1,3 +1,10 @@
import ru.pulsar.jenkins.library.utils.Logger
def call() {
if (!fileExists("packagedef")) {
return
}
Logger.println("Установка локальных зависимостей OneScript")
cmd("opm install -l")
}

4
vars/syntaxCheck.groovy
View File

@@ -2,6 +2,7 @@ import hudson.FilePath
import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.VRunner
def call(JobConfiguration config) {
@@ -27,7 +28,8 @@ def call(JobConfiguration config) {
String outPath = pathToJUnitReport.getParent()
createDir(outPath)
String command = 'oscript_modules/bin/vrunner syntax-check --ibconnection "/F./build/ib"'
String vrunnerPath = VRunner.getVRunnerPath();
String command = "$vrunnerPath syntax-check --ibconnection \"/F./build/ib\""
// Временно убрал передачу параметра.
// См. https://github.com/vanessa-opensource/vanessa-runner/issues/361