From 21f43bcaab0888308f8c35289a83d9c920566f7d Mon Sep 17 00:00:00 2001 From: radtriste Date: Wed, 16 Aug 2023 15:11:20 +0200 Subject: [PATCH] CI: Review full profile usage --- .ci/jenkins/config/branch.yaml | 9 +++++++++ .ci/jenkins/dsl/jobs.groovy | 21 ++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index d4d8be132877..04c2e46c6b2d 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -1,8 +1,12 @@ environments: + default: + env_vars: + DROOLS_BUILD_MVN_OPTS: -Dfull native: env_vars: NATIVE: true BUILD_MVN_OPTS_CURRENT: -Dnative -Dquarkus.native.container-build=true + DROOLS_BUILD_MVN_OPTS: -Dfull ADDITIONAL_TIMEOUT: 720 ids: - native @@ -20,6 +24,7 @@ environments: enabled: false env_vars: QUARKUS_BRANCH: main + DROOLS_BUILD_MVN_OPTS: -Dfull ids: - quarkus quarkus-3: @@ -28,12 +33,15 @@ environments: BUILD_MAVEN_TOOL: kie-maven-3.9.1 BUILD_JDK_TOOL: kie-jdk17 BUILD_MVN_OPTS: -Denforcer.skip + # No `-Dfull``yet as `DROOLS_BUILD_MVN_OPTS` as it does not compile + BUILD_MVN_OPTS_QUARKUS_UPDATE: -Dfull ids: - quarkus - quarkus3 quarkus-branch: env_vars: QUARKUS_BRANCH: '2.16' + DROOLS_BUILD_MVN_OPTS: -Dfull ids: - quarkus quarkus-lts: @@ -49,6 +57,7 @@ environments: auto_generation: false env_vars: ENABLE_SONARCLOUD: true + DROOLS_BUILD_MVN_OPTS: -Dfull ids: - sonarcloud - coverage diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 5113f1bf7e38..c1cf7f28eae7 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -135,7 +135,6 @@ void setupProjectPostReleaseJob() { /////////////////////////////////////////////////////////////////////////////////////////// Map getMultijobPRConfig(JenkinsFolder jobFolder) { - String defaultBuildMvnOptsCurrent = jobFolder.getDefaultEnvVarValue('BUILD_MVN_OPTS_CURRENT') ?: '' def jobConfig = [ parallel: true, buildchain: true, @@ -147,8 +146,6 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { // Sonarcloud analysis only on main branch // As we have only Community edition ENABLE_SONARCLOUD: EnvUtils.isDefaultEnvironment(this, jobFolder.getEnvironmentName()) && Utils.isMainBranch(this), - // Setup full build if not prod profile - BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${EnvUtils.hasEnvironmentId(this, jobFolder.getEnvironmentName(), 'prod') || EnvUtils.hasEnvironmentId(this, jobFolder.getEnvironmentName(), 'quarkus3') ? '' : '-Dfull'}", ] ], [ id: 'kogito-runtimes', @@ -196,21 +193,15 @@ KogitoJobUtils.createAllEnvironmentsPerRepoPRJobs(this) { jobFolder -> getMultij createSetupBranchJob() // Nightly jobs -Closure addFullProfileJobParamsGetter = { script -> - def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script) - jobParams.env.put('BUILD_MVN_OPTS_CURRENT', '-Dfull') - return jobParams -} - -KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true, addFullProfileJobParamsGetter) +KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true) // Environment nightlies -setupSpecificBuildChainNightlyJob('native', addFullProfileJobParamsGetter) -setupSpecificBuildChainNightlyJob('sonarcloud', addFullProfileJobParamsGetter) +setupSpecificBuildChainNightlyJob('native') +setupSpecificBuildChainNightlyJob('sonarcloud') // Jobs with integration branch -setupQuarkusIntegrationJob('quarkus-main', addFullProfileJobParamsGetter) -setupQuarkusIntegrationJob('quarkus-branch', addFullProfileJobParamsGetter) +setupQuarkusIntegrationJob('quarkus-main') +setupQuarkusIntegrationJob('quarkus-branch') setupQuarkusIntegrationJob('quarkus-lts') setupQuarkusIntegrationJob('native-lts') // Quarkus 3 nightly is exported to Kogito pipelines for easier integration @@ -228,7 +219,7 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'drools', [ // Quarkus 3 if (EnvUtils.isEnvironmentEnabled(this, 'quarkus-3')) { - // setupPrQuarkus3RewriteJob() # TODO to enable if you want the PR quarkus-3 rewrite job + setupPrQuarkus3RewriteJob() setupStandaloneQuarkus3RewriteJob() }