From 6e37cb8ffd67970a935f20fe3a2be35e83f2e58f Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 14 Aug 2023 16:18:55 +0200 Subject: [PATCH] kie-issues#423: Prepare for 2.x stream --- .ci/jenkins/Jenkinsfile.deploy | 7 ++- .ci/jenkins/Jenkinsfile.setup-branch | 1 + .ci/jenkins/dsl/jobs.groovy | 66 ++++++++++++++++------------ 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index e3980c0f2b..067b337038 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -124,7 +124,11 @@ pipeline { steps { script { dir(getRepoName()) { - getMavenCommand().withProperty('maven.test.failure.ignore', true).skipTests(params.SKIP_TESTS).run('clean install') + getMavenCommand() + .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : []) + .withProperty('maven.test.failure.ignore', true) + .skipTests(params.SKIP_TESTS) + .run('clean install') } } } @@ -316,6 +320,7 @@ void setDeployPropertyIfNeeded(String key, def value) { MavenCommand getMavenCommand() { MavenCommand mvnCmd = new MavenCommand(this, ['-fae', '-ntp']) .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID) + .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : []) .withProperty('full') if (env.MAVEN_DEPENDENCIES_REPOSITORY) { mvnCmd.withDependencyRepositoryInSettings('deps-repo', env.MAVEN_DEPENDENCIES_REPOSITORY) diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 2fb61a94fa..667bb64ad0 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -198,6 +198,7 @@ String getGitAuthorCredsID() { MavenCommand getMavenCommand(String directory = '') { def mvnCmd = new MavenCommand(this, ['-fae', '-ntp']) .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID) + .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : []) if (directory) { mvnCmd.inDirectory(directory) } diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 0aaac92c96..de465d95b9 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -18,6 +18,10 @@ import org.kie.jenkins.jobdsl.Utils jenkins_path = '.ci/jenkins' +boolean isMainStream() { + return Utils.getStream(this) == 'main' +} + Map getMultijobPRConfig(JenkinsFolder jobFolder) { String defaultBuildMvnOptsCurrent = jobFolder.getDefaultEnvVarValue('BUILD_MVN_OPTS_CURRENT') ?: '' def jobConfig = [ @@ -30,7 +34,7 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { env : [ // Sonarcloud analysis is disabled for examples KOGITO_EXAMPLES_SUBFOLDER_POM: 'kogito-quarkus-examples/', - BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${jobFolder.getEnvironmentName() ? '' : '-Dvalidate-formatting'}", // Validate formatting only for default env + BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${getExamplesBuildMvnOptions(jobFolder).join(' ')}", ] ], [ @@ -49,10 +53,19 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { ] ] ] - + return jobConfig } +List getExamplesBuildMvnOptions(JenkinsFolder jobFolder) { + List mvnOpts = [] + if (isMainStream() && !jobFolder.getEnvironmentName()) { + // Validate formatting only for default env + mvnOpts += ['-Dvalidate-formatting'] + } + return mvnOpts +} + // PR checks KogitoJobUtils.createAllEnvironmentsPerRepoPRJobs(this) { jobFolder -> getMultijobPRConfig(jobFolder) } setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd') @@ -61,30 +74,34 @@ setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd') createSetupBranchJob() // Nightly jobs -KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true) - -// Environment nightlies -setupSpecificBuildChainNightlyJob('native') - -// Jobs with integration branch -setupNightlyQuarkusIntegrationJob('quarkus-main') -setupNightlyQuarkusIntegrationJob('quarkus-branch') -setupNightlyQuarkusIntegrationJob('quarkus-lts') -setupNightlyQuarkusIntegrationJob('native-lts') +Closure setup4AMCronTriggerJobParamsGetter = { script -> + def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script) + jobParams.triggers = [ cron: 'H 4 * * *' ] + return jobParams +} +Closure nightlyJobParamsGetter = isMainStream() ? JobParamsUtils.DEFAULT_PARAMS_GETTER : setup4AMCronTriggerJobParamsGetter +KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true, nightlyJobParamsGetter) +setupSpecificBuildChainNightlyJob('native', nightlyJobParamsGetter) +setupNightlyQuarkusIntegrationJob('quarkus-main', nightlyJobParamsGetter) +setupNightlyQuarkusIntegrationJob('quarkus-branch', nightlyJobParamsGetter) +setupNightlyQuarkusIntegrationJob('quarkus-lts', nightlyJobParamsGetter) +setupNightlyQuarkusIntegrationJob('native-lts', nightlyJobParamsGetter) // Release jobs setupDeployJob(JobType.RELEASE) setupPromoteJob(JobType.RELEASE) setupPostReleaseJob() -KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-examples', [ - properties: [ 'quarkus-plugin.version', 'quarkus.platform.version' ], -]) +if (isMainStream()) { + KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-examples', [ + properties: [ 'quarkus-plugin.version', 'quarkus.platform.version' ], + ]) -// Quarkus 3 -if (EnvUtils.isEnvironmentEnabled(this, 'quarkus-3')) { - setupPrQuarkus3RewriteJob() - setupStandaloneQuarkus3RewriteJob() + // Quarkus 3 + if (EnvUtils.isEnvironmentEnabled(this, 'quarkus-3')) { + setupPrQuarkus3RewriteJob() + setupStandaloneQuarkus3RewriteJob() + } } ///////////////////////////////////////////////////////////////// @@ -95,15 +112,14 @@ void setupNightlyQuarkusIntegrationJob(String envName, Closure defaultJobParamsG KogitoJobUtils.createNightlyBuildChainIntegrationJob(this, envName, Utils.getRepoName(this), true, defaultJobParamsGetter) } -void setupSpecificBuildChainNightlyJob(String envName) { - KogitoJobUtils.createNightlyBuildChainBuildAndTestJobForCurrentRepo(this, envName, true) +void setupSpecificBuildChainNightlyJob(String envName, Closure defaultJobParamsGetter = JobParamsUtils.DEFAULT_PARAMS_GETTER) { + KogitoJobUtils.createNightlyBuildChainBuildAndTestJobForCurrentRepo(this, envName, true, defaultJobParamsGetter) } void createSetupBranchJob() { def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-examples', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Examples Init branch') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) jobParams.env.putAll([ - REPO_NAME: 'kogito-examples', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", GIT_AUTHOR: "${GIT_AUTHOR_NAME}", @@ -142,7 +158,6 @@ void setupDeployJob(JobType jobType, String envName = '') { jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository) } jobParams.env.putAll([ - REPO_NAME: 'kogito-examples', PROPERTIES_FILE_NAME: 'deployment.properties', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", @@ -201,7 +216,6 @@ void setupPromoteJob(JobType jobType) { def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-examples-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Examples Promote') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) jobParams.env.putAll([ - REPO_NAME: 'kogito-examples', PROPERTIES_FILE_NAME: 'deployment.properties', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", @@ -238,7 +252,6 @@ void setupPostReleaseJob() { def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-examples-post-release', JobType.RELEASE, "${jenkins_path}/Jenkinsfile.post-release", 'Kogito Examples Post Release') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) jobParams.env.putAll([ - REPO_NAME: 'kogito-examples', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", GIT_AUTHOR: "${GIT_AUTHOR_NAME}", @@ -259,7 +272,6 @@ void setupPostReleaseJob() { } } - void setupPrQuarkus3RewriteJob() { def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-examples.rewrite', JobType.PULL_REQUEST, 'quarkus-3', "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.pr", 'Kogito Examples Quarkus 3 rewrite patch regeneration') JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams) @@ -299,4 +311,4 @@ void setupStandaloneQuarkus3RewriteJob() { booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.') } } -} \ No newline at end of file +}