From 670e6867551f775044fd1853c0e34543f0cb65ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Wed, 24 Jan 2024 15:34:19 +0100 Subject: [PATCH 1/3] Try to clean up quarkus and main jobs --- .ci/jenkins/dsl/jobs.groovy | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 379f1911e..e752cbf4d 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -13,49 +13,15 @@ boolean isMainStream() { // Tools setupUpdateJenkinsDependenciesJob() -if (isMainStream()) { - setupCreateIssueToolsJob() - setupCleanOldNamespacesToolsJob() - setupCleanOldNightlyImagesToolsJob() - - KogitoJobUtils.createQuarkusPlatformUpdateToolsJob(this, 'kogito') - if (Utils.isMainBranch(this)) { - setupBuildOperatorNode() - } - - KogitoJobUtils.createMainQuarkusUpdateToolsJob(this, - [ 'kogito-runtimes', 'kogito-examples', 'kogito-docs', 'kogito-images' ], - [ 'radtriste', 'cristianonicolai' ] - ) -} // Setup branch branch createSetupBranchJob() -if (isMainStream()) { - createSetupBranchCloudJob() -} // Nightly setupNightlyJob() setupQuarkusPlatformJob(JobType.NIGHTLY) -if (isMainStream()) { - setupNightlyCloudJob() - setupQuarkus3NightlyJob() -} KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-main') -KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts') -KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-branch') -KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'native-lts') -KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-3', []) { script -> - def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script) - jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '2.x') - return jobParams -} - -// Release -setupReleaseArtifactsJob() -setupReleaseCloudJob() ///////////////////////////////////////////////////////////////// // Methods From 26f974111b3643eabdb54dee49513842b9389161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Thu, 25 Jan 2024 16:47:21 +0100 Subject: [PATCH 2/3] recommended changes? --- .ci/jenkins/config/branch.yaml | 56 ++++++++++++---------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 816d15f09..1476ea9dd 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -1,3 +1,20 @@ +generation_config: + missing_environments: ignore + +job_types: + setup_branch: + disabled: true + nightly: + disabled: false + other: + disabled: true + pullrequest: + disabled: false + release: + disabled: true + tools: + disabled: true + environments: native: env_vars: @@ -6,47 +23,12 @@ 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: '2.13' - ADDITIONAL_TIMEOUT: 720 - BUILD_ENVIRONMENT: quarkus-lts - ids: - - native - - prod - - lts quarkus-main: enabled: false env_vars: QUARKUS_BRANCH: main ids: - quarkus - quarkus-branch: - env_vars: - QUARKUS_BRANCH: '2.16' - ids: - - quarkus - quarkus-3: - pull_request_default_check: false - env_vars: - BUILD_MAVEN_TOOL: kie-maven-3.9.1 - BUILD_JDK_TOOL: kie-jdk17 - BUILD_MVN_OPTS: -Denforcer.skip - ids: - - quarkus - - quarkus3 - 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 @@ -127,7 +109,7 @@ cloud: jenkins: email_creds_id: KOGITO_CI_EMAIL_TO default_tools: - jdk: kie-jdk11 - maven: kie-maven-3.8.7 + jdk: kie-jdk17 + maven: kie-maven-3.9.3 sonar_jdk: kie-jdk17 jobs_definition_file: .ci/jenkins/dsl/jobs.groovy From e0666e86ded315421debbd180d93cbe698e7ea68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Thu, 1 Feb 2024 15:22:06 +0100 Subject: [PATCH 3/3] reverted jobs.groovy --- .ci/jenkins/dsl/jobs.groovy | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index e752cbf4d..379f1911e 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -13,15 +13,49 @@ boolean isMainStream() { // Tools setupUpdateJenkinsDependenciesJob() +if (isMainStream()) { + setupCreateIssueToolsJob() + setupCleanOldNamespacesToolsJob() + setupCleanOldNightlyImagesToolsJob() + + KogitoJobUtils.createQuarkusPlatformUpdateToolsJob(this, 'kogito') + if (Utils.isMainBranch(this)) { + setupBuildOperatorNode() + } + + KogitoJobUtils.createMainQuarkusUpdateToolsJob(this, + [ 'kogito-runtimes', 'kogito-examples', 'kogito-docs', 'kogito-images' ], + [ 'radtriste', 'cristianonicolai' ] + ) +} // Setup branch branch createSetupBranchJob() +if (isMainStream()) { + createSetupBranchCloudJob() +} // Nightly setupNightlyJob() setupQuarkusPlatformJob(JobType.NIGHTLY) +if (isMainStream()) { + setupNightlyCloudJob() + setupQuarkus3NightlyJob() +} KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-main') +KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts') +KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-branch') +KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'native-lts') +KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-3', []) { script -> + def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script) + jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '2.x') + return jobParams +} + +// Release +setupReleaseArtifactsJob() +setupReleaseCloudJob() ///////////////////////////////////////////////////////////////// // Methods