diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index ce8ca2657e1..674848ce0df 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -99,7 +99,6 @@ List getRuntimesBuildMvnOptions(JenkinsFolder jobFolder) { // PR checks KogitoJobUtils.createAllEnvironmentsPerRepoPRJobs(this) { jobFolder -> getMultijobPRConfig(jobFolder) } -setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd') // Init branch createSetupBranchJob() @@ -115,8 +114,8 @@ setupNightlyQuarkusIntegrationJob('quarkus-lts', nightlyJobParamsGetter) setupNightlyQuarkusIntegrationJob('native-lts', nightlyJobParamsGetter) // Release jobs -setupDeployJob(JobType.RELEASE) -setupPromoteJob(JobType.RELEASE) +setupReleaseDeployJob() +setupReleasePromoteJob() // Tools job if (isMainStream()) { @@ -173,53 +172,31 @@ void createSetupBranchJob() { } } -void setupDeployJob(JobType jobType, String envName = '') { - def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-runtimes-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Runtimes Deploy') +void setupReleaseDeployJob() { + def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-runtimes-deploy', JobType.RELEASE, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Runtimes 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([ 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_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}", + MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", + MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_URL}", + MAVEN_REPO_CREDS_ID: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_CREDS_ID}", + + NEXUS_RELEASE_URL: "${MAVEN_NEXUS_RELEASE_URL}", + NEXUS_RELEASE_REPOSITORY_ID: "${MAVEN_NEXUS_RELEASE_REPOSITORY}", + NEXUS_STAGING_PROFILE_ID: "${MAVEN_NEXUS_STAGING_PROFILE_ID}", + NEXUS_BUILD_PROMOTION_PROFILE_ID: "${MAVEN_NEXUS_BUILD_PROMOTION_PROFILE_ID}", ]) - if (jobType == JobType.PULL_REQUEST) { - jobParams.env.putAll([ - MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}", - MAVEN_DEPLOY_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}", - MAVEN_REPO_CREDS_ID: "${MAVEN_PR_CHECKS_REPOSITORY_CREDS_ID}", - ]) - } 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_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", - MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_URL}", - MAVEN_REPO_CREDS_ID: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_CREDS_ID}", - ]) - if (jobType == JobType.RELEASE) { - jobParams.env.putAll([ - NEXUS_RELEASE_URL: "${MAVEN_NEXUS_RELEASE_URL}", - NEXUS_RELEASE_REPOSITORY_ID: "${MAVEN_NEXUS_RELEASE_REPOSITORY}", - NEXUS_STAGING_PROFILE_ID: "${MAVEN_NEXUS_STAGING_PROFILE_ID}", - NEXUS_BUILD_PROMOTION_PROFILE_ID: "${MAVEN_NEXUS_BUILD_PROMOTION_PROFILE_ID}", - ]) - } - } KogitoJobTemplate.createPipelineJob(this, jobParams)?.with { parameters { stringParam('DISPLAY_NAME', '', 'Setup a specific build display name') stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout') - if (jobType == JobType.PULL_REQUEST) { - // author can be changed as param only for PR behavior, due to source branch/target, else it is considered as an env - stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout') - } // Build&test information booleanParam('SKIP_TESTS', false, 'Skip tests') @@ -235,8 +212,8 @@ void setupDeployJob(JobType jobType, String envName = '') { } } -void setupPromoteJob(JobType jobType) { - def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-runtimes-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Runtimes Promote') +void setupReleasePromoteJob() { + def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-runtimes-promote', JobType.RELEASE, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Runtimes Promote') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) jobParams.env.putAll([ PROPERTIES_FILE_NAME: 'deployment.properties', diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index dde252a7dd5..8d9ffd4d835 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -71,10 +71,6 @@ How to retest this PR or trigger a specific build: - for a specific native lts check Run native checks against quarkus lts branch Please add comment: Jenkins (re)run [kogito-runtimes|kogito-apps|kogito-examples] native-lts - -- Full Kogito testing (with cloud images and operator BDD testing) - Please add comment: Jenkins run BDD - This check should be used only if a big change is done as it takes time to run, need resources and one full BDD tests check can be done at a time ...