mirror of
https://github.com/firstBitMarksistskaya/jenkins-lib.git
synced 2025-03-17 21:17:50 +02:00
Завернул получение данных авторизации в хранилище в отдельный шаг
JobConfiguration должен быть инициализирован на момент компиляции пайплайна, чтобы его можно было использовать внутри enviroment-блока, а в текущих реалиях это невозможно.
This commit is contained in:
parent
82193bcd40
commit
a57d7d6818
@ -29,10 +29,6 @@ void call() {
|
||||
}
|
||||
|
||||
stage('pipeline1C') {
|
||||
environment {
|
||||
STORAGE_PATH = credentials(jobConfiguration.secrets.storagePath)
|
||||
STORAGE = credentials(jobConfiguration.secrets.storage)
|
||||
}
|
||||
|
||||
parallel {
|
||||
stage('SonarQube') {
|
||||
@ -65,7 +61,9 @@ void call() {
|
||||
def storageVersion = versionParser.storage()
|
||||
|
||||
// Создание базы загрузкой конфигурации из хранилища
|
||||
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\""
|
||||
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\""
|
||||
}
|
||||
}
|
||||
|
||||
zipInfobase()
|
||||
|
17
vars/withStorageCredentials.groovy
Normal file
17
vars/withStorageCredentials.groovy
Normal file
@ -0,0 +1,17 @@
|
||||
import ru.pulsar.jenkins.library.configuration.JobConfiguration
|
||||
|
||||
def call(JobConfiguration jobConfiguration, Closure body) {
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: jobConfiguration.secrets.storage,
|
||||
passwordVariable: 'STORAGE_PSW',
|
||||
usernameVariable: 'STORAGE_USR'
|
||||
),
|
||||
string(
|
||||
credentialsId: jobConfiguration.secrets.storagePath,
|
||||
variable: 'STORAGE_PATH'
|
||||
)
|
||||
]) {
|
||||
body()
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user