From 62c1563fb707414b078688d595ead4c94f3a8cfa Mon Sep 17 00:00:00 2001 From: "aleksandr.vodyanov" Date: Thu, 23 May 2024 16:55:22 +0300 Subject: [PATCH] [DO-200] fixed mistakes (!26) Reviewed-on: https://git.avroid.tech/DevOps/jenkins-pipelines/pulls/26 Co-authored-by: aleksandr.vodyanov Co-committed-by: aleksandr.vodyanov --- pipelines/Release-activity/platformng.groovy | 6 +++--- pipelines/jobs-dsl/jobs-dsl.groovy | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pipelines/Release-activity/platformng.groovy b/pipelines/Release-activity/platformng.groovy index 97b601c..cedb342 100644 --- a/pipelines/Release-activity/platformng.groovy +++ b/pipelines/Release-activity/platformng.groovy @@ -61,16 +61,16 @@ podTemplate(workspaceVolume: hostPathWorkspaceVolume(hostPath: "/data"), yaml: g stage('Create branch') { currentBuild.description = "Build from ${params.SOURCE_BRANCH_NAME}" String versionPattern = /^\d+\.\d+.*/ - Gitea tavroRepo = new Gitea(this, "${apiRepoURL}/BBL/platformng", "${env.JENKINS_GIT_CREDENTIALS_HTTP}") + Gitea platformngRepo = new Gitea(this, "${apiRepoURL}/BBL/platformng", "${env.JENKINS_GIT_CREDENTIALS_HTTP}") branch = params.BRANCH_TYPE.toLowerCase() + params.VERSION println "Branch name: ${branch}" - if (!params.VERSION.matches(versionPattern) { + if (!params.VERSION.matches(versionPattern)) { println('You must specify correct version, see description!') error() } - Boolean result = tavroRepo.createBranch(params.SOURCE_BRANCH_NAME, branch) + Boolean result = platformngRepo.createBranch(params.SOURCE_BRANCH_NAME, branch) if (!result) { println("Branch doesn't create, maybe ${branch} already exists") diff --git a/pipelines/jobs-dsl/jobs-dsl.groovy b/pipelines/jobs-dsl/jobs-dsl.groovy index f65ce88..4347056 100644 --- a/pipelines/jobs-dsl/jobs-dsl.groovy +++ b/pipelines/jobs-dsl/jobs-dsl.groovy @@ -41,7 +41,9 @@ podTemplate(workspaceVolume: hostPathWorkspaceVolume(hostPath: "/data"), } stage('Run job dsl') { - List launchJobs = [ 'Release-activity/Tavro' ] + List launchJobs = [ 'Release-activity/Tavro', + 'Release-activity/Platformng' + ] jobDsl( targets: 'jobs-dsl/folders/*.groovy\n' + 'jobs-dsl/jobs/**/*.groovy\n' +