You've already forked jenkins-lib
forked from jenkins/jenkins-lib
подключение расширений на разных шагах
исправление замечаний
This commit is contained in:
@@ -2,9 +2,9 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
|
||||
import ru.pulsar.jenkins.library.ioc.ContextRegistry
|
||||
import ru.pulsar.jenkins.library.steps.LoadExtensions
|
||||
|
||||
def call(JobConfiguration config) {
|
||||
def call(JobConfiguration config, String stageName = "") {
|
||||
ContextRegistry.registerDefaultContext(this)
|
||||
|
||||
def loadExtensions = new LoadExtensions(config)
|
||||
def loadExtensions = new LoadExtensions(config, stageName)
|
||||
loadExtensions.run()
|
||||
}
|
@@ -196,18 +196,33 @@ void call() {
|
||||
}
|
||||
|
||||
stage('BDD сценарии') {
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.bdd }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.bdd, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
bdd config
|
||||
stage('Загрузка расширений в конфигурацию'){
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.needLoadExtensions('bdd') }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) {
|
||||
loadExtensions config 'bdd'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Выполнение BDD сценариев') {
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.bdd }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.bdd, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
bdd config
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -228,35 +243,66 @@ void call() {
|
||||
}
|
||||
|
||||
stage('Дымовые тесты') {
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.smoke }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.smoke, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
smoke config
|
||||
stage('Загрузка расширений в конфигурацию') {
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.needLoadExtensions('smoke') }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) {
|
||||
loadExtensions config 'smoke'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Выполнение дымовых тестов') {
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.smoke }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.smoke, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
smoke config
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('YAXUnit тесты') {
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.yaxunit }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.yaxunit, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
yaxunit config
|
||||
stage('Загрузка расширений в конфигурацию') {
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.needLoadExtensions('yaxunit') }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) {
|
||||
loadExtensions config 'yaxunit'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Выполнение YAXUnit тестов') {
|
||||
|
||||
agent {
|
||||
label agent1C
|
||||
}
|
||||
when {
|
||||
beforeAgent true
|
||||
expression { config.stageFlags.yaxunit }
|
||||
}
|
||||
steps {
|
||||
timeout(time: config.timeoutOptions.yaxunit, unit: TimeUnit.MINUTES) {
|
||||
unzipInfobase()
|
||||
|
||||
yaxunit config
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user