diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index c38675208..eef93174c 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -18,7 +18,6 @@ jenkins_path = '.ci/jenkins' // PR checks setupPrJob() -setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd') // Init branch createSetupBranchJob() @@ -99,41 +98,27 @@ void createSetupBranchJob() { } } -void setupDeployJob(JobType jobType, String envName = '') { +void setupDeployJob(JobType jobType) { setupBuildImageJob(jobType, envName) def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) - if (jobType == JobType.PULL_REQUEST) { - jobParams.git.branch = '${BUILD_BRANCH_NAME}' - jobParams.git.author = '${GIT_AUTHOR}' - jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository) - } jobParams.env.putAll([ - REPO_NAME: 'kogito-images', PROPERTIES_FILE_NAME: 'deployment.properties', MAX_REGISTRY_RETRIES: 3, JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", + + GIT_AUTHOR: "${GIT_AUTHOR_NAME}", + AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}", + GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}", + + MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", + DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}", + + QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this), ]) - if (jobType == JobType.PULL_REQUEST) { - jobParams.env.putAll([ - MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}", - ]) - } else { - jobParams.env.putAll([ - GIT_AUTHOR: "${GIT_AUTHOR_NAME}", - - AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}", - GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}", - - MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", - DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}", - - QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this), - ]) - } if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) { jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES')) }