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

Убрал closure, заменил на отдельный общий шаг для обновления из хранилища

Browse Source
This commit is contained in:
Nikita Gryzlov
2020-04-15 12:27:24 +03:00
parent 3c4ef7443d
commit 5762353fe1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vars/withStorageCredentials.groovy → vars/initFromStorage.groovy
View File

@@ -1,6 +1,6 @@
import ru.pulsar.jenkins.library.configuration.JobConfiguration
def <T extends Closure> void call(JobConfiguration jobConfiguration, T body) {
def call(JobConfiguration jobConfiguration, String storageVersion) {
withCredentials([
usernamePassword(
credentialsId: jobConfiguration.secrets.storage,
@@ -12,6 +12,6 @@ def <T extends Closure> void call(JobConfiguration jobConfiguration, T body) {
variable: 'STORAGE_PATH'
)
]) {
body()
cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
}
}

6
vars/pipeline1C.groovy
View File

@@ -60,11 +60,10 @@ void call() {
def storageVersion = versionParser.storage()
// Создание базы загрузкой конфигурации из хранилища
withStorageCredentials(jobConfiguration) {
cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
}
initFromStorage(jobConfiguration, storageVersion)
}
zipInfobase()
}
}
@@ -101,4 +100,5 @@ void call() {
}
}
}
}