diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 7dee6d5e5dc..bdb7d2c1b5d 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -10,32 +10,13 @@ environments: ADDITIONAL_TIMEOUT: 720 ids: - native - native-lts: - env_vars: - NATIVE: true - BUILD_MVN_OPTS: -Dproductized -Ddata-index-ephemeral.image=quay.io/kiegroup/kogito-data-index-ephemeral - BUILD_MVN_OPTS_CURRENT: -Dnative -Dquarkus.native.container-build=true - QUARKUS_BRANCH: '3.2' - ADDITIONAL_TIMEOUT: 720 - ids: - - native - - prod quarkus-main: enabled: false env_vars: QUARKUS_BRANCH: main DROOLS_BUILD_MVN_OPTS: -Dfull ids: - - quarkus - quarkus-lts: - pull_request_default_check: false - env_vars: - BUILD_MVN_OPTS: -Dproductized -Ddata-index-ephemeral.image=quay.io/kiegroup/kogito-data-index-ephemeral - QUARKUS_BRANCH: '2.13' - ids: - quarkus - - lts - - prod sonarcloud: enabled: false auto_generation: false @@ -100,6 +81,6 @@ cloud: jenkins: email_creds_id: DROOLS_CI_EMAIL_TO default_tools: - jdk: kie-jdk11 + jdk: kie-jdk17 maven: kie-maven-3.9.3 sonar_jdk: kie-jdk17 diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 21cdc30653c..9b4115d3d67 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -42,7 +42,7 @@ setupProjectPostReleaseJob() KogitoJobUtils.createQuarkusPlatformUpdateToolsJob(this, 'drools') KogitoJobUtils.createMainQuarkusUpdateToolsJob(this, [ 'drools' ], - [ 'mariofusco', 'danielezonca'] + [ 'mariofusco'] ) void createProjectSetupBranchJob() { @@ -171,11 +171,6 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { ] ] - // For Quarkus 3, run only drools PR check... for now - if (EnvUtils.hasEnvironmentId(this, jobFolder.getEnvironmentName(), 'quarkus3')) { - jobConfig.jobs.retainAll { it.id == 'drools' } - } - return jobConfig } @@ -198,13 +193,13 @@ setupSpecificBuildChainNightlyJob('native', nightlyJobParamsGetter) setupSpecificBuildChainNightlyJob('sonarcloud', nightlyJobParamsGetter) setupQuarkusIntegrationJob('quarkus-main', nightlyJobParamsGetter) setupQuarkusIntegrationJob('quarkus-branch', nightlyJobParamsGetter) -setupQuarkusIntegrationJob('quarkus-lts', nightlyJobParamsGetter) -setupQuarkusIntegrationJob('native-lts', nightlyJobParamsGetter) +//setupQuarkusIntegrationJob('quarkus-lts', nightlyJobParamsGetter) +//setupQuarkusIntegrationJob('native-lts', nightlyJobParamsGetter) // Quarkus 3 nightly is exported to Kogito pipelines for easier integration // Release jobs -setupDeployJob(JobType.RELEASE) -setupPromoteJob(JobType.RELEASE) +//setupDeployJob(JobType.RELEASE) +//setupPromoteJob(JobType.RELEASE) // Tools job if (isMainStream()) { @@ -213,12 +208,6 @@ if (isMainStream()) { compare_deps_remote_poms: [ 'io.quarkus:quarkus-bom' ], properties: [ 'version.io.quarkus' ], ]) - - // Quarkus 3 - if (EnvUtils.isEnvironmentEnabled(this, 'quarkus-3')) { - setupPrQuarkus3RewriteJob() - setupStandaloneQuarkus3RewriteJob() - } } ///////////////////////////////////////////////////////////////// @@ -336,42 +325,3 @@ void setupPromoteJob(JobType jobType) { } } } - -void setupPrQuarkus3RewriteJob() { - def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'drools.rewrite', JobType.PULL_REQUEST, 'quarkus-3', "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.pr", 'Drools Quarkus 3 rewrite patch regeneration') - JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) - jobParams.jenkinsfile = "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.pr" - jobParams.pr.putAll([ - run_only_for_branches: [ "${GIT_BRANCH}" ], - disable_status_message_error: true, - disable_status_message_failure: true, - trigger_phrase: '.*[j|J]enkins,?.*(rewrite|write) [Q|q]uarkus-3.*', - trigger_phrase_only: true, - commitContext: 'Quarkus 3 rewrite', - ]) - jobParams.env.putAll([ - AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}", - MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}", - ]) - KogitoJobTemplate.createPRJob(this, jobParams) -} - -void setupStandaloneQuarkus3RewriteJob() { - def jobParams = JobParamsUtils.getBasicJobParams(this, 'drools.quarkus-3.rewrite', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.standalone", 'Drools Quarkus 3 rewrite patch regeneration') - JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) - jobParams.env.putAll(EnvUtils.getEnvironmentEnvVars(this, 'quarkus-3')) - jobParams.env.putAll([ - AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}", - JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", - MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}", - ]) - KogitoJobTemplate.createPipelineJob(this, jobParams)?.with { - parameters { - stringParam('DISPLAY_NAME', '', 'Setup a specific build display name') - stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout') - stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout') - booleanParam('IS_PR_SOURCE_BRANCH', false, 'Set to true if you are launching the job for a PR source branch') - booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.') - } - } -}