[BXMSPROD-2019] Productized branch creation #967

lampajr · 2023-05-09T09:28:19Z

JIRA: https://issues.redhat.com/browse/BXMSPROD-2019

Referenced Pull Requests:

deploy artifacts configurable

Improvements:

Update build chain configuration on DSL config repository
Update prod branch on all repos
Downgrade Quarkus

lampajr · 2023-05-09T09:33:49Z

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

+                        String repoCredsId = repoConfig.author?.credentials_id ?: readMainBranchConfig().git.author.credentials_id
+
+                        // TODO is this value saved somewhere such that we do not have to hardcode?
+                        String jobsGroovyPath = '.ci/jenkins/dsl/jobs.groovy'


where could we save this path in order to avoid hardcoding it? maybe we can simply save it on the branch.yaml, wdyt?

in the env ?

I decided to put it in the branch.yaml > jenkins > jobs_definition_file [1] to make it more customizable, wdyt?

[1] https://github.com/kiegroup/kogito-pipelines/pull/967/files#diff-e528bf449969213a2b24315837341a4cbe03d928d66ade752bdab2a628b6424eR144

lampajr · 2023-05-09T09:35:54Z

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

+                                // def jobsGroovy = readFile file: jobsGroovyPath
+                                // remove fullProfile
+                                sh "sed -i 's/, addFullProfileJobParamsGetter)/)/g' ${jobsGroovyPath}"
+                                // TODO: disable pr checks in getMultijobPRConfig, get them from params


This should be the last remaining part to implement, disable PR checks from jobs.groovy file.
I would do that in a separate PR as I need to re-think a bit what is the best way to handle it.

I think we need to redo the way the PR checks are generated in those repositories, to make it more dynamic, based on:

build-chain-config

or a file in .ci folder (name to be considered)

we can discuss about that if you want

I agree as at the moment to disable them we should manipulate the file and it could be tricky to fully automate, furthermore changes on the file could also easily break the automation as it would be. So I agree on rethink how to setup those jobs.

lampajr · 2023-05-09T09:46:49Z

Jenkins DSL / Drools DSL Downstream tests - lampajr/drools (pull_request) is failing for this:

org.kie.jenkins.jobdsl.JobScriptsSpec > test script /tmp/tmp.kqlIuPlzrE/dsl/seed/jobs/jobs.groovy FAILED
    org.spockframework.runtime.UnallowedExceptionThrownError at JobScriptsSpec.groovy:76
        Caused by: javaposse.jobdsl.dsl.DslScriptException at JobScriptsSpec.groovy:72
            Caused by: groovy.lang.MissingMethodException at JobScriptsSpec.groovy:72

lampajr · 2023-05-11T15:14:04Z

Jenkins DSL / Drools DSL Downstream tests - lampajr/drools (pull_request) is failing for this:

org.kie.jenkins.jobdsl.JobScriptsSpec > test script /tmp/tmp.kqlIuPlzrE/dsl/seed/jobs/jobs.groovy FAILED
    org.spockframework.runtime.UnallowedExceptionThrownError at JobScriptsSpec.groovy:76
        Caused by: javaposse.jobdsl.dsl.DslScriptException at JobScriptsSpec.groovy:72
            Caused by: groovy.lang.MissingMethodException at JobScriptsSpec.groovy:72

looks like it was a temporary/random issue :/ it was using forked drools branch that was not existing anymore (maybe cached?) - now all green

lampajr · 2023-05-25T09:00:58Z

Linked https://github.com/kiegroup/optaplanner/pull/2845 to setup DSL changes on OptaPlanner repo too

dsl/seed/jobs/root_jobs.groovy

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

radtriste · 2023-06-20T11:59:41Z

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

+                        String repoCredsId = repoConfig.author?.credentials_id ?: readMainBranchConfig().git.author.credentials_id
+
+                        // TODO is this value saved somewhere such that we do not have to hardcode?
+                        String jobsGroovyPath = '.ci/jenkins/dsl/jobs.groovy'


in the env ?

radtriste · 2023-06-20T12:02:46Z

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

+                                // def jobsGroovy = readFile file: jobsGroovyPath
+                                // remove fullProfile
+                                sh "sed -i 's/, addFullProfileJobParamsGetter)/)/g' ${jobsGroovyPath}"
+                                // TODO: disable pr checks in getMultijobPRConfig, get them from params


I think we need to redo the way the PR checks are generated in those repositories, to make it more dynamic, based on:

build-chain-config

or a file in .ci folder (name to be considered)

we can discuss about that if you want

dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare

Co-authored-by: Tristan Radisson <[email protected]>

lampajr requested review from radtriste and rgdoliveira May 9, 2023 09:31

lampajr commented May 9, 2023

View reviewed changes

lampajr added 3 commits May 11, 2023 17:03

[BXMSPROD-2019] update build-chain config

d5d176b

[BXMSPROD-2019] Update prod branch and downgrade quarkus

0e4d0f9

fix path to file_path on branch.yaml

139ba2a

lampajr marked this pull request as ready for review May 11, 2023 15:14

lampajr mentioned this pull request May 25, 2023

[BXMSPROD-2019] Setup automated prod branch creation apache/incubator-kie-optaplanner#2845

Merged

3 tasks

lampajr marked this pull request as draft June 5, 2023 09:55

This was referenced Jun 5, 2023

Made deploy artifacts on setup-branch configurable apache/incubator-kie-drools#5285

Merged

Made deploy artifacts on setup-branch configurable apache/incubator-kie-optaplanner#2866

Merged

Trigger setup-branch job to update versions

50c8967

lampajr marked this pull request as ready for review June 5, 2023 11:00

radtriste reviewed Jun 20, 2023

View reviewed changes

lampajr and others added 3 commits June 20, 2023 14:42

Apply suggestions from code review

0a18c07

Co-authored-by: Tristan Radisson <[email protected]>

Applied suggestions after code review

42b0cf3

applying patches running .ci/environments/update.sh script

ac058b2

radtriste approved these changes Jun 26, 2023

View reviewed changes

This was referenced Jun 26, 2023

[8.40.x] Made deploy artifacts on setup-branch configurable apache/incubator-kie-optaplanner#2887

Merged

[8.40.x] Made deploy artifacts on setup-branch configurable apache/incubator-kie-drools#5346

Merged

lampajr merged commit 9f2ae9e into apache:main Jun 26, 2023

lampajr deleted the BXMSPROD_2019_prod_branch branch June 26, 2023 09:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[BXMSPROD-2019] Productized branch creation #967

[BXMSPROD-2019] Productized branch creation #967

lampajr commented May 9, 2023 •

edited

Loading

lampajr May 9, 2023 •

edited

Loading

radtriste Jun 20, 2023

lampajr Jun 20, 2023

lampajr May 9, 2023

radtriste Jun 20, 2023

lampajr Jun 20, 2023

lampajr commented May 9, 2023

lampajr commented May 11, 2023 •

edited

Loading

lampajr commented May 25, 2023

radtriste Jun 20, 2023

radtriste Jun 20, 2023

[BXMSPROD-2019] Productized branch creation #967

[BXMSPROD-2019] Productized branch creation #967

Conversation

lampajr commented May 9, 2023 • edited Loading

lampajr May 9, 2023 • edited Loading

Choose a reason for hiding this comment

radtriste Jun 20, 2023

Choose a reason for hiding this comment

lampajr Jun 20, 2023

Choose a reason for hiding this comment

lampajr May 9, 2023

Choose a reason for hiding this comment

radtriste Jun 20, 2023

Choose a reason for hiding this comment

lampajr Jun 20, 2023

Choose a reason for hiding this comment

lampajr commented May 9, 2023

lampajr commented May 11, 2023 • edited Loading

lampajr commented May 25, 2023

radtriste Jun 20, 2023

Choose a reason for hiding this comment

radtriste Jun 20, 2023

Choose a reason for hiding this comment

lampajr commented May 9, 2023 •

edited

Loading

lampajr May 9, 2023 •

edited

Loading

lampajr commented May 11, 2023 •

edited

Loading