From 999d5ee84c3b9ae704740b90147dbc14739f0c93 Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 11:22:39 +0200 Subject: [PATCH 01/10] Update `kiegroup` repository references to `apache` --- .ci/actions/build-chain/action.yml | 2 +- .ci/actions/dsl-tests/action.yml | 2 +- .ci/actions/os-preparation/action.yaml | 2 +- .ci/chain-status-info.md | 4 +-- .ci/jenkins/Jenkinsfile.build-operator-node | 2 +- .ci/jenkins/Jenkinsfile.release | 4 +-- .ci/jenkins/config/branch.yaml | 2 +- .ci/jenkins/config/main.yaml | 2 +- .ci/jenkins/tests/setup_pipeline_env.sh | 2 +- .ci/project-dependencies.yaml | 34 +++++++++---------- .ci/pull-request-config.yaml | 10 +++--- .github/workflows/generate_status_page.yaml | 4 +-- .../workflows/generate_status_page_data.yaml | 4 +-- .github/workflows/jenkins-dsl-downstream.yml | 18 +++++----- .github/workflows/jenkins-tests.yml | 6 ++-- README.md | 14 ++++---- docs/jenkins.md | 4 +-- docs/nightly pipeline.md | 24 ++++++------- docs/release pipeline.md | 28 +++++++-------- dsl/scripts/pr_check.groovy | 2 +- dsl/seed/jenkinsfiles/Jenkinsfile.buildchain | 6 ++-- dsl/seed/jobs/seed_job_branch.groovy | 2 +- dsl/seed/jobs/seed_job_main.groovy | 6 ++-- dsl/seed/scripts/seed_test.sh | 12 +++---- .../jenkins/jobdsl/KogitoJobTemplate.groovy | 6 ++-- .../org/kie/jenkins/jobdsl/Utils.groovy | 6 ++-- .../jobdsl/utils/JobParamsUtils.groovy | 2 +- .../jenkins/jobdsl/utils/SeedJobUtils.groovy | 2 +- tools/update-kie7-version.sh | 4 +-- tools/update-quarkus-versions.sh | 4 +-- 30 files changed, 110 insertions(+), 110 deletions(-) diff --git a/.ci/actions/build-chain/action.yml b/.ci/actions/build-chain/action.yml index bd171e795..b8a5fc03a 100644 --- a/.ci/actions/build-chain/action.yml +++ b/.ci/actions/build-chain/action.yml @@ -7,7 +7,7 @@ inputs: definition-file: description: 'The `definition-file` input for the build-chain' required: false - default: 'https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' + default: 'https://raw.githubusercontent.com/${GROUP:apache}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' flow-type: description: "the flow to execute, it can be 'cross_pr' (or 'pull-request' which is deprecated), 'full_downstream' (or 'full-downstream' which is deprecated), 'single_pr' (or 'single' which is deprecated) or 'branch'" default: "cross_pr" diff --git a/.ci/actions/dsl-tests/action.yml b/.ci/actions/dsl-tests/action.yml index 0f4a330a5..09a09d8c7 100644 --- a/.ci/actions/dsl-tests/action.yml +++ b/.ci/actions/dsl-tests/action.yml @@ -46,7 +46,7 @@ runs: - name: Checkout Seed repo uses: actions/checkout@v3 with: - repository: kiegroup/kogito-pipelines + repository: apache/kogito-pipelines ref: main path: seed_repo diff --git a/.ci/actions/os-preparation/action.yaml b/.ci/actions/os-preparation/action.yaml index c9d1d8a24..a7fbd811e 100644 --- a/.ci/actions/os-preparation/action.yaml +++ b/.ci/actions/os-preparation/action.yaml @@ -5,7 +5,7 @@ inputs: repository: description: "The repository containing the matrix-os.json os configuration" required: false - default: "kiegroup/kogito-pipelines" + default: "apache/kogito-pipelines" branch: description: "The repository branch from which the matrix configuration must be taken" required: false diff --git a/.ci/chain-status-info.md b/.ci/chain-status-info.md index 33cedd822..94e5239a3 100644 --- a/.ci/chain-status-info.md +++ b/.ci/chain-status-info.md @@ -1,5 +1,5 @@ # Kiegroup Kogito organization repositories CI Status -This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/kiegroup/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). +This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/apache/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). -Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/kiegroup/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. +Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/apache/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. diff --git a/.ci/jenkins/Jenkinsfile.build-operator-node b/.ci/jenkins/Jenkinsfile.build-operator-node index 7ab4d0289..4976cfde5 100644 --- a/.ci/jenkins/Jenkinsfile.build-operator-node +++ b/.ci/jenkins/Jenkinsfile.build-operator-node @@ -20,7 +20,7 @@ pipeline { steps { script { deleteDir() - checkout(githubscm.resolveRepository('kogito-pipelines', 'kiegroup', 'main', false)) + checkout(githubscm.resolveRepository('kogito-pipelines', 'apache', 'main', false)) } } } diff --git a/.ci/jenkins/Jenkinsfile.release b/.ci/jenkins/Jenkinsfile.release index 087a1de69..2eccc43de 100644 --- a/.ci/jenkins/Jenkinsfile.release +++ b/.ci/jenkins/Jenkinsfile.release @@ -50,8 +50,8 @@ pipeline { sendNotification("Release Pipeline has started...\nKogito version = ${getKogitoVersion()}\n=> ${env.BUILD_URL}") // Safety measure to not publish to main JBoss - if (getGitAuthor() != 'kiegroup' && !getArtifactsRepositoryParam()) { - sendNotification("Git Author is different from `kiegroup` and no `ARTIFACTS_REPOSITORY` parameter has been provided. Are you sure you want to continue ? => ${env.BUILD_URL}input") + if (getGitAuthor() != 'apache' && !getArtifactsRepositoryParam()) { + sendNotification("Git Author is different from `apache` and no `ARTIFACTS_REPOSITORY` parameter has been provided. Are you sure you want to continue ? => ${env.BUILD_URL}input") input message: 'Should the pipeline continue with no `ARTIFACTS_REPOSITORY` defined ?', ok: 'Yes' } } diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 471ca5662..ae5d828ae 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -55,7 +55,7 @@ repositories: # branch: main-kogito # TODO kie-docs PR should be against `main-kogito` git: author: - name: kiegroup + name: apache credentials_id: kie-ci3 token_credentials_id: kie-ci3-token fork_author: diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml index 531d6eecc..889fd7175 100644 --- a/.ci/jenkins/config/main.yaml +++ b/.ci/jenkins/config/main.yaml @@ -24,7 +24,7 @@ seed: git: repository: kogito-pipelines author: - name: kiegroup + name: apache credentials_id: kie-ci3 branch: apache_migration path: .ci/jenkins/config/branch.yaml diff --git a/.ci/jenkins/tests/setup_pipeline_env.sh b/.ci/jenkins/tests/setup_pipeline_env.sh index 8943da04e..c49492089 100755 --- a/.ci/jenkins/tests/setup_pipeline_env.sh +++ b/.ci/jenkins/tests/setup_pipeline_env.sh @@ -5,7 +5,7 @@ author=$1 branch=$2 if [ -z $author ]; then - author='kiegroup' + author='apache' fi if [ -z $branch ]; then diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml index 3ccedbab8..5b8c6abb2 100644 --- a/.ci/project-dependencies.yaml +++ b/.ci/project-dependencies.yaml @@ -1,6 +1,6 @@ version: "2.1" dependencies: - - project: kiegroup/drools + - project: apache/drools mapping: dependencies: default: @@ -11,11 +11,11 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" exclude: - - kiegroup/kie-jpmml-integration + - apache/kie-jpmml-integration - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes dependencies: - - project: kiegroup/drools + - project: apache/drools mapping: dependencies: default: @@ -26,12 +26,12 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-apps + - apache/kogito-examples + - apache/kogito-apps - - project: kiegroup/kogito-apps + - project: apache/kogito-apps dependencies: - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes mapping: dependencies: default: @@ -42,13 +42,13 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-runtimes + - apache/kogito-examples + - apache/kogito-runtimes - - project: kiegroup/kogito-examples + - project: apache/kogito-examples dependencies: - - project: kiegroup/kogito-runtimes - - project: kiegroup/kogito-apps + - project: apache/kogito-runtimes + - project: apache/kogito-apps mapping: dependencies: default: @@ -59,9 +59,9 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-apps - - kiegroup/kogito-runtimes - - project: kiegroup/kie-jpmml-integration + - apache/kogito-apps + - apache/kogito-runtimes + - project: apache/kie-jpmml-integration dependencies: - - project: kiegroup/drools + - project: apache/drools # no mapping needed diff --git a/.ci/pull-request-config.yaml b/.ci/pull-request-config.yaml index c65b6cd42..0875f98ef 100644 --- a/.ci/pull-request-config.yaml +++ b/.ci/pull-request-config.yaml @@ -25,7 +25,7 @@ default: mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} build: - - project: kiegroup/drools + - project: apache/drools build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.DROOLS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -33,7 +33,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.DROOLS_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_RUNTIMES_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -41,7 +41,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly -Dfull ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kogito-apps + - project: apache/kogito-apps build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_APPS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -54,7 +54,7 @@ build: **/cypress/screenshots/** **/cypress/videos/** - - project: kiegroup/kogito-examples + - project: apache/kogito-examples build-command: # First install the main pom # Then build the required submodule pom @@ -65,7 +65,7 @@ build: upstream: | mvn dependency:tree clean install -DskipTests -DskipITs ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_EXAMPLES_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kie-jpmml-integration + - project: apache/kie-jpmml-integration build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` diff --git a/.github/workflows/generate_status_page.yaml b/.github/workflows/generate_status_page.yaml index f6cef9f1e..9e76f3afa 100644 --- a/.github/workflows/generate_status_page.yaml +++ b/.github/workflows/generate_status_page.yaml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: generate-status-page: - if: github.repository_owner == 'kiegroup' + if: github.repository_owner == 'apache' concurrency: group: generate-status-page cancel-in-progress: true @@ -15,5 +15,5 @@ jobs: - name: Generate status page uses: kiegroup/chain-status/.ci/actions/generate-app@main with: - info-md-url: "https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/.ci/chain-status-info.md" + info-md-url: "https://raw.githubusercontent.com/apache/kogito-pipelines/main/.ci/chain-status-info.md" github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/generate_status_page_data.yaml b/.github/workflows/generate_status_page_data.yaml index c313cad67..293f7deb1 100644 --- a/.github/workflows/generate_status_page_data.yaml +++ b/.github/workflows/generate_status_page_data.yaml @@ -7,7 +7,7 @@ on: jobs: generate-status-page-data: - if: github.repository_owner == 'kiegroup' + if: github.repository_owner == 'apache' concurrency: group: generate-status-page-data cancel-in-progress: true @@ -32,7 +32,7 @@ jobs: with: projects: "${{ steps.retrieve_active_repos.outputs.result }}" title: Kogito Status - subtitle: Kiegroup Kogito organization repositories CI status + subtitle: Apache Kogito organization repositories CI status base-branch-filter: "${{ steps.retrieve_active_branches.outputs.result }}" branches: 1.13.x,1.13.x-blue created-by: GitHub Action diff --git a/.github/workflows/jenkins-dsl-downstream.yml b/.github/workflows/jenkins-dsl-downstream.yml index 30e2618bc..bc1d4f18f 100644 --- a/.github/workflows/jenkins-dsl-downstream.yml +++ b/.github/workflows/jenkins-dsl-downstream.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/kogito-pipelines + repository: apache/kogito-pipelines ref: main path: main_config_repo @@ -156,9 +156,9 @@ jobs: with: project: kogito repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/kogito-pipelines + main-config-file-repo: apache/kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/kogito-pipelines + branch-config-file-repo: apache/kogito-pipelines base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -193,7 +193,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/optaplanner + repository: apache/optaplanner ref: main path: main_config_repo @@ -320,9 +320,9 @@ jobs: with: project: optaplanner repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/optaplanner + main-config-file-repo: apache/optaplanner main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/optaplanner + branch-config-file-repo: apache/optaplanner base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -357,7 +357,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/drools + repository: apache/drools ref: main path: main_config_repo @@ -479,7 +479,7 @@ jobs: with: project: drools repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/drools + main-config-file-repo: apache/drools main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/drools + branch-config-file-repo: apache/drools base-branch: ${{ env.BASE_BRANCH }} diff --git a/.github/workflows/jenkins-tests.yml b/.github/workflows/jenkins-tests.yml index e774d6957..b054c37cc 100644 --- a/.github/workflows/jenkins-tests.yml +++ b/.github/workflows/jenkins-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout shared libraries uses: actions/checkout@v3 with: - repository: kiegroup/jenkins-pipeline-shared-libraries + repository: apache/jenkins-pipeline-shared-libraries path: shared-libs - name: Set up JDK 1.8 @@ -49,7 +49,7 @@ jobs: - name: DSL tests uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main with: - main-config-file-repo: kiegroup/kogito-pipelines + main-config-file-repo: apache/kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/kogito-pipelines + branch-config-file-repo: apache/kogito-pipelines \ No newline at end of file diff --git a/README.md b/README.md index a917bff3f..098a6dbe0 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ This repository contains some of the pipelines of Kogito project. Apart from this repository, pipelines are also concerning those repositories: -* [kogito-runtimes](https://github.com/kiegroup/kogito-runtimes) -* [kogito-apps](https://github.com/kiegroup/kogito-apps) -* [kogito-examples](https://github.com/kiegroup/kogito-examples) -* [kogito-images](https://github.com/kiegroup/kogito-images) -* [kogito-operator](https://github.com/kiegroup/kogito-operator) -* [kie-tools](https://github.com/kiegroup/kie-tools) +* [kogito-runtimes](https://github.com/apache/kogito-runtimes) +* [kogito-apps](https://github.com/apache/kogito-apps) +* [kogito-examples](https://github.com/apache/kogito-examples) +* [kogito-images](https://github.com/apache/kogito-images) +* [kogito-operator](https://github.com/apache/kogito-operator) +* [kie-tools](https://github.com/apache/kie-tools) # The different Kogito pipelines @@ -122,7 +122,7 @@ Jenkins PR checks are of 3 different types: Each repository has a different yaml files in `.github/workflows` folder to configure the workflow. -We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/kiegroup/kogito-pipelines/tree/main/.ci/actions). +We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/apache/kogito-pipelines/tree/main/.ci/actions). After the build, test results are parsed and logged using the [`action-surefire-report`](https://github.com/ScaCap/action-surefire-report) action. diff --git a/docs/jenkins.md b/docs/jenkins.md index 4d3033257..92dddc66c 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -257,7 +257,7 @@ Then, you can also add a small `.ci/jenkins/dsl/test.sh` to test your groovy scr file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ ``` @@ -290,7 +290,7 @@ If you don't have access to the Kogito `0-seed-job`, you can also create one bas 3) Copy the create the `0-seed-job` and point the parameters of the job to the main config file you created. Depending on what you changed and need to test, you may have different parameters to update: * Setup `SEED_CONFIG_FILE_*` parameters correctly to the author/branch you pushed your test modifications. This is always required. - * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `kiegroup/main`. + * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `apache/main`. 4) Launch the `0-seed-job` and it should create all the needed jobs **Again, please make sure that you setup your own configuration !** diff --git a/docs/nightly pipeline.md b/docs/nightly pipeline.md index 1337390f3..768ff48e3 100644 --- a/docs/nightly pipeline.md +++ b/docs/nightly pipeline.md @@ -17,18 +17,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) ## Nightly pipeline Architecture diff --git a/docs/release pipeline.md b/docs/release pipeline.md index a4174a0c6..5b5cdd551 100644 --- a/docs/release pipeline.md +++ b/docs/release pipeline.md @@ -38,18 +38,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) ## Release process @@ -159,7 +159,7 @@ Once the Release Pipeline is finished, there are some actions to be done: ##### Operator Crd/Csv files -Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/kiegroup/kogito-operator). +Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/apache/kogito-operator). You will need to create, with those files, new OperatorHub PRs (one for Openshift and one for Kubernetes) or asked someone from Cloud part to do it. If there is any change to be done due to PRs, do it on the release branch. @@ -189,7 +189,7 @@ To deploy only artifacts (without Cloud part), you should start the release pipe To deploy only the Cloud part, you should start the release pipeline with those parameters: -* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/kiegroup/kogito-examples) +* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/apache/kogito-examples) * EXAMPLES_REF => point to current release branch * SKIP_ARTIFACTS_DEPLOY => checked * SKIP_ARTIFACTS_PROMOTE => checked diff --git a/dsl/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy index 5a0437005..9d0620f43 100644 --- a/dsl/scripts/pr_check.groovy +++ b/dsl/scripts/pr_check.groovy @@ -92,7 +92,7 @@ String getBuildChainCommandline() { String buildChainProject = env.BUILDCHAIN_PROJECT ?: CHANGE_REPO String buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' String buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' - String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:kiegroup}' + String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' String buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' List buildChainAdditionalArguments = [ diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain index 0cb8372e2..fc4bdfdc6 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain @@ -24,7 +24,7 @@ downstreamBuild = env.DOWNSTREAM_BUILD ? env.DOWNSTREAM_BUILD.toBoolean() : fals buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' -buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:kiegroup}' +buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' buildChainAction = isFDBBuildChainType() ? 'full_downstream' : buildChainType buildChainAdditionalArguments = buildChainProject ? [ "-p ${buildChainProject}" ] : [] @@ -231,9 +231,9 @@ String getProjectFolder() { // First guessing whether there is a clone defined into the buildchain config // If not, fallback to simple folder structure - String projectFolder = "bc/kiegroup_${project}/${project}" + String projectFolder = "bc/apache_${project}/${project}" if (!fileExists(projectFolder)) { - projectFolder = "bc/kiegroup_${project}" + projectFolder = "bc/apache_${project}" } return projectFolder diff --git a/dsl/seed/jobs/seed_job_branch.groovy b/dsl/seed/jobs/seed_job_branch.groovy index 976e6c935..edad4ecb9 100644 --- a/dsl/seed/jobs/seed_job_branch.groovy +++ b/dsl/seed/jobs/seed_job_branch.groovy @@ -45,7 +45,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob("${GENERATION_BRANCH}/${JOB_NAME}") { - description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") + description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") logRotator { numToKeep(5) diff --git a/dsl/seed/jobs/seed_job_main.groovy b/dsl/seed/jobs/seed_job_main.groovy index 4265c4396..80188355c 100644 --- a/dsl/seed/jobs/seed_job_main.groovy +++ b/dsl/seed/jobs/seed_job_main.groovy @@ -11,7 +11,7 @@ String getSeedRepo() { } String getSeedAuthor() { - return Utils.getSeedAuthor(this) ?: 'kiegroup' + return Utils.getSeedAuthor(this) ?: 'apache' } String getSeedAuthorCredsId() { @@ -27,7 +27,7 @@ String getSeedConfigFileGitRepository() { } String getSeedConfigFileGitAuthorName() { - return SEED_CONFIG_FILE_GIT_AUTHOR_NAME ?: 'kiegroup' + return SEED_CONFIG_FILE_GIT_AUTHOR_NAME ?: 'apache' } String getSeedConfigFileGitAuthorCredsId() { @@ -72,7 +72,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob('0-seed-job') { - description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/dsl/seed/scripts/seed_test.sh b/dsl/seed/scripts/seed_test.sh index e0e36809f..c148f47dd 100755 --- a/dsl/seed/scripts/seed_test.sh +++ b/dsl/seed/scripts/seed_test.sh @@ -6,7 +6,7 @@ # #!/bin/bash -e # file=$(mktemp) # # For more usage of the script, use ./test.sh -h -# curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +# curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh # chmod u+x ${file} # ${file} $@ @@ -24,7 +24,7 @@ usage() { echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REPO Main config file repository (owner/repo)' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REF Main config file reference' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_PATH Main config file path. Default is `.ci/jenkins/config/main.yaml`' - echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `kiegroup/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `apache/kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF Fallback main config reference. Default is `main`' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_LOCAL_PATH Main config file local path. If set, the other `DSL_DEFAULT_MAIN_CONFIG_FILE_*` envs will be ignored' echo @@ -39,7 +39,7 @@ usage() { echo ' DSL_DEFAULT_SEED_REPO DSL seed repository (owner/repo). Else it will be calculated from the test repository.' echo ' DSL_DEFAULT_SEED_REF DSL seed reference. Else it will be calculated from the branch config' echo ' DSL_DEFAULT_SEED_REPO_LOCAL_PATH DSL seed repository local path. If set, the other `DSL_DEFAULT_SEED_*` envs will be ignored' - echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `kiegroup/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `apache/kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_SEED_REF Fallback seed reference. Default is `main`' echo echo ' Test repository configuration:' @@ -179,9 +179,9 @@ branch_config_file_ref=${DSL_DEFAULT_BRANCH_CONFIG_FILE_REF} branch_config_file_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_PATH} branch_config_file_local_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_LOCAL_PATH:-''} -fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'kiegroup/kogito-pipelines'} +fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} fallback_main_config_file_ref=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF:-'main'} -fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'kiegroup/kogito-pipelines'} +fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} fallback_branch_config_file_ref=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REF:-'main'} fallback_branch_config_name="${fallback_main_config_file_ref}" @@ -315,7 +315,7 @@ seed_repo=${DSL_DEFAULT_SEED_REPO} seed_ref=${DSL_DEFAULT_SEED_REF} seed_local_path=${DSL_DEFAULT_SEED_REPO_LOCAL_PATH} -fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'kiegroup/kogito-pipelines'} +fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'apache/kogito-pipelines'} fallback_seed_ref=${DSL_DEFAULT_FALLBACK_SEED_REF} if [ -z ${fallback_seed_ref} ]; then fallback_seed_ref="$(yq -e ".git.branches[] | select(.name == \"${branch_config_name}\") | .seed.branch" ${main_config_file_path} 2> /dev/null)" diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy index ab23b3432..8e70dbc31 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy @@ -183,13 +183,13 @@ class KogitoJobTemplate { jobParams.pr.putAll ([ run_only_for_labels: (jobParams.pr.run_only_for_labels ?: []) + [KogitoConstants.LABEL_DSL_TEST], run_only_for_branches: [ jobParams.git.repository == 'optaplanner-quickstarts' ? 'development' : 'main' ], - authorized_users: [ 'kiegroup' ], - authorized_groups: [ 'kiegroup' ], + authorized_users: [ 'apache' ], + authorized_groups: [ 'apache' ], ]) // Enable PR test only if main branch if (Utils.isMainBranch(script)) { - jobParams.git.project_url = "https://github.com/kiegroup/${jobParams.pr.target_repository ?: jobParams.git.repository}/" + jobParams.git.project_url = "https://github.com/apache/${jobParams.pr.target_repository ?: jobParams.git.repository}/" } } diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy index a7598445d..3ac526bad 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy @@ -98,9 +98,9 @@ class Utils { static boolean isProdEnvironment(def script) { // Check for all possible `GIT_AUTHOR_NAME` variables - return getSeedAuthor(script) == 'kiegroup' && - (hasGitAuthor(script) ? getGitAuthor(script) == 'kiegroup' : true) && - (hasSeedConfigFileGitAuthor(script) ? getSeedConfigFileGitAuthor(script) == 'kiegroup' : true) + return getSeedAuthor(script) == 'kieapachegroup' && + (hasGitAuthor(script) ? getGitAuthor(script) == 'apache' : true) && + (hasSeedConfigFileGitAuthor(script) ? getSeedConfigFileGitAuthor(script) == 'apache' : true) } static boolean isTestEnvironment(def script) { diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy index 7c946f034..e03515693 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy @@ -137,7 +137,7 @@ class JobParamsUtils { setupJobParamsSeedPipelineConfiguration(script, jobParams, KogitoConstants.BUILD_CHAIN_JENKINSFILE) jobParams.env = jobParams.env ?: [:] jobParams.env.putAll([ - BUILDCHAIN_PROJECT: "kiegroup/${repository}", + BUILDCHAIN_PROJECT: "apache/${repository}", BUILDCHAIN_TYPE: buildchainType, BUILDCHAIN_CONFIG_REPO: Utils.getBuildChainConfigRepo(script) ?: Utils.getSeedRepo(script), BUILDCHAIN_CONFIG_AUTHOR: Utils.getBuildChainConfigAuthor(script) ?: Utils.getSeedAuthor(script), diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy index 2f53892a6..86089d381 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy @@ -15,7 +15,7 @@ class SeedJobUtils { throw new RuntimeException('pathsToListen cannot be empty, else it would end up in an infinite loop ...'); } def job = jenkinsScript.pipelineJob(jobName) { - description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/tools/update-kie7-version.sh b/tools/update-kie7-version.sh index a1582c1c3..831030198 100755 --- a/tools/update-kie7-version.sh +++ b/tools/update-kie7-version.sh @@ -85,7 +85,7 @@ if [ "$FORK" = "" ]; then fi REPO=kogito-runtimes -ORIGIN=kiegroup/$REPO +ORIGIN=apache/$REPO PR_FORK=$FORK/$REPO PR_BRANCH=${BRANCH}-bump-${PREFIX}kie-$KIE_VERSION @@ -120,7 +120,7 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/kiegroup/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi diff --git a/tools/update-quarkus-versions.sh b/tools/update-quarkus-versions.sh index ad4cf80a0..44880659c 100755 --- a/tools/update-quarkus-versions.sh +++ b/tools/update-quarkus-versions.sh @@ -113,7 +113,7 @@ if [ "$FORK" = "" ]; then exit 2 fi -ORIGIN=kiegroup/$REPO +ORIGIN=apache/$REPO PR_FORK=$FORK/$REPO PR_BRANCH=${BRANCH}-bump-quarkus-$QUARKUS_VERSION @@ -183,6 +183,6 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/kiegroup/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi \ No newline at end of file From f08657af652b32c8a57e82921e8fb33eb2432549 Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 11:22:39 +0200 Subject: [PATCH 02/10] Update `kiegroup` repository references to `apache` --- .ci/actions/build-chain/action.yml | 2 +- .ci/actions/dsl-tests/action.yml | 2 +- .ci/actions/os-preparation/action.yaml | 2 +- .ci/chain-status-info.md | 4 +-- .ci/jenkins/Jenkinsfile.build-operator-node | 2 +- .ci/jenkins/Jenkinsfile.release | 4 +-- .ci/jenkins/config/branch.yaml | 2 +- .ci/jenkins/config/main.yaml | 2 +- .ci/jenkins/tests/setup_pipeline_env.sh | 2 +- .ci/project-dependencies.yaml | 34 +++++++++---------- .ci/pull-request-config.yaml | 10 +++--- .github/workflows/generate_status_page.yaml | 4 +-- .../workflows/generate_status_page_data.yaml | 4 +-- .github/workflows/jenkins-dsl-downstream.yml | 18 +++++----- .github/workflows/jenkins-tests.yml | 6 ++-- README.md | 14 ++++---- docs/jenkins.md | 4 +-- docs/nightly pipeline.md | 24 ++++++------- docs/release pipeline.md | 28 +++++++-------- dsl/scripts/pr_check.groovy | 2 +- dsl/seed/jenkinsfiles/Jenkinsfile.buildchain | 6 ++-- dsl/seed/jobs/seed_job_branch.groovy | 2 +- dsl/seed/jobs/seed_job_main.groovy | 6 ++-- dsl/seed/scripts/seed_test.sh | 12 +++---- .../jenkins/jobdsl/KogitoJobTemplate.groovy | 6 ++-- .../org/kie/jenkins/jobdsl/Utils.groovy | 6 ++-- .../jobdsl/utils/JobParamsUtils.groovy | 2 +- .../jenkins/jobdsl/utils/SeedJobUtils.groovy | 2 +- tools/update-kie7-version.sh | 4 +-- tools/update-quarkus-versions.sh | 4 +-- 30 files changed, 110 insertions(+), 110 deletions(-) diff --git a/.ci/actions/build-chain/action.yml b/.ci/actions/build-chain/action.yml index bd171e795..b8a5fc03a 100644 --- a/.ci/actions/build-chain/action.yml +++ b/.ci/actions/build-chain/action.yml @@ -7,7 +7,7 @@ inputs: definition-file: description: 'The `definition-file` input for the build-chain' required: false - default: 'https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' + default: 'https://raw.githubusercontent.com/${GROUP:apache}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' flow-type: description: "the flow to execute, it can be 'cross_pr' (or 'pull-request' which is deprecated), 'full_downstream' (or 'full-downstream' which is deprecated), 'single_pr' (or 'single' which is deprecated) or 'branch'" default: "cross_pr" diff --git a/.ci/actions/dsl-tests/action.yml b/.ci/actions/dsl-tests/action.yml index 0f4a330a5..09a09d8c7 100644 --- a/.ci/actions/dsl-tests/action.yml +++ b/.ci/actions/dsl-tests/action.yml @@ -46,7 +46,7 @@ runs: - name: Checkout Seed repo uses: actions/checkout@v3 with: - repository: kiegroup/kogito-pipelines + repository: apache/kogito-pipelines ref: main path: seed_repo diff --git a/.ci/actions/os-preparation/action.yaml b/.ci/actions/os-preparation/action.yaml index c9d1d8a24..a7fbd811e 100644 --- a/.ci/actions/os-preparation/action.yaml +++ b/.ci/actions/os-preparation/action.yaml @@ -5,7 +5,7 @@ inputs: repository: description: "The repository containing the matrix-os.json os configuration" required: false - default: "kiegroup/kogito-pipelines" + default: "apache/kogito-pipelines" branch: description: "The repository branch from which the matrix configuration must be taken" required: false diff --git a/.ci/chain-status-info.md b/.ci/chain-status-info.md index 33cedd822..94e5239a3 100644 --- a/.ci/chain-status-info.md +++ b/.ci/chain-status-info.md @@ -1,5 +1,5 @@ # Kiegroup Kogito organization repositories CI Status -This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/kiegroup/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). +This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/apache/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). -Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/kiegroup/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. +Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/apache/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. diff --git a/.ci/jenkins/Jenkinsfile.build-operator-node b/.ci/jenkins/Jenkinsfile.build-operator-node index 7ab4d0289..4976cfde5 100644 --- a/.ci/jenkins/Jenkinsfile.build-operator-node +++ b/.ci/jenkins/Jenkinsfile.build-operator-node @@ -20,7 +20,7 @@ pipeline { steps { script { deleteDir() - checkout(githubscm.resolveRepository('kogito-pipelines', 'kiegroup', 'main', false)) + checkout(githubscm.resolveRepository('kogito-pipelines', 'apache', 'main', false)) } } } diff --git a/.ci/jenkins/Jenkinsfile.release b/.ci/jenkins/Jenkinsfile.release index 087a1de69..2eccc43de 100644 --- a/.ci/jenkins/Jenkinsfile.release +++ b/.ci/jenkins/Jenkinsfile.release @@ -50,8 +50,8 @@ pipeline { sendNotification("Release Pipeline has started...\nKogito version = ${getKogitoVersion()}\n=> ${env.BUILD_URL}") // Safety measure to not publish to main JBoss - if (getGitAuthor() != 'kiegroup' && !getArtifactsRepositoryParam()) { - sendNotification("Git Author is different from `kiegroup` and no `ARTIFACTS_REPOSITORY` parameter has been provided. Are you sure you want to continue ? => ${env.BUILD_URL}input") + if (getGitAuthor() != 'apache' && !getArtifactsRepositoryParam()) { + sendNotification("Git Author is different from `apache` and no `ARTIFACTS_REPOSITORY` parameter has been provided. Are you sure you want to continue ? => ${env.BUILD_URL}input") input message: 'Should the pipeline continue with no `ARTIFACTS_REPOSITORY` defined ?', ok: 'Yes' } } diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 6b04ce99b..06ba84afe 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -55,7 +55,7 @@ repositories: # branch: main-kogito # TODO kie-docs PR should be against `main-kogito` git: author: - name: kiegroup + name: apache credentials_id: kie-ci3 token_credentials_id: kie-ci3-token fork_author: diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml index 531d6eecc..889fd7175 100644 --- a/.ci/jenkins/config/main.yaml +++ b/.ci/jenkins/config/main.yaml @@ -24,7 +24,7 @@ seed: git: repository: kogito-pipelines author: - name: kiegroup + name: apache credentials_id: kie-ci3 branch: apache_migration path: .ci/jenkins/config/branch.yaml diff --git a/.ci/jenkins/tests/setup_pipeline_env.sh b/.ci/jenkins/tests/setup_pipeline_env.sh index 8943da04e..c49492089 100755 --- a/.ci/jenkins/tests/setup_pipeline_env.sh +++ b/.ci/jenkins/tests/setup_pipeline_env.sh @@ -5,7 +5,7 @@ author=$1 branch=$2 if [ -z $author ]; then - author='kiegroup' + author='apache' fi if [ -z $branch ]; then diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml index 3ccedbab8..5b8c6abb2 100644 --- a/.ci/project-dependencies.yaml +++ b/.ci/project-dependencies.yaml @@ -1,6 +1,6 @@ version: "2.1" dependencies: - - project: kiegroup/drools + - project: apache/drools mapping: dependencies: default: @@ -11,11 +11,11 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" exclude: - - kiegroup/kie-jpmml-integration + - apache/kie-jpmml-integration - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes dependencies: - - project: kiegroup/drools + - project: apache/drools mapping: dependencies: default: @@ -26,12 +26,12 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-apps + - apache/kogito-examples + - apache/kogito-apps - - project: kiegroup/kogito-apps + - project: apache/kogito-apps dependencies: - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes mapping: dependencies: default: @@ -42,13 +42,13 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-runtimes + - apache/kogito-examples + - apache/kogito-runtimes - - project: kiegroup/kogito-examples + - project: apache/kogito-examples dependencies: - - project: kiegroup/kogito-runtimes - - project: kiegroup/kogito-apps + - project: apache/kogito-runtimes + - project: apache/kogito-apps mapping: dependencies: default: @@ -59,9 +59,9 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - kiegroup/kogito-apps - - kiegroup/kogito-runtimes - - project: kiegroup/kie-jpmml-integration + - apache/kogito-apps + - apache/kogito-runtimes + - project: apache/kie-jpmml-integration dependencies: - - project: kiegroup/drools + - project: apache/drools # no mapping needed diff --git a/.ci/pull-request-config.yaml b/.ci/pull-request-config.yaml index c65b6cd42..0875f98ef 100644 --- a/.ci/pull-request-config.yaml +++ b/.ci/pull-request-config.yaml @@ -25,7 +25,7 @@ default: mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} build: - - project: kiegroup/drools + - project: apache/drools build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.DROOLS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -33,7 +33,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.DROOLS_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kogito-runtimes + - project: apache/kogito-runtimes build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_RUNTIMES_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -41,7 +41,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly -Dfull ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kogito-apps + - project: apache/kogito-apps build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_APPS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -54,7 +54,7 @@ build: **/cypress/screenshots/** **/cypress/videos/** - - project: kiegroup/kogito-examples + - project: apache/kogito-examples build-command: # First install the main pom # Then build the required submodule pom @@ -65,7 +65,7 @@ build: upstream: | mvn dependency:tree clean install -DskipTests -DskipITs ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_EXAMPLES_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kie-jpmml-integration + - project: apache/kie-jpmml-integration build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` diff --git a/.github/workflows/generate_status_page.yaml b/.github/workflows/generate_status_page.yaml index f6cef9f1e..9e76f3afa 100644 --- a/.github/workflows/generate_status_page.yaml +++ b/.github/workflows/generate_status_page.yaml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: generate-status-page: - if: github.repository_owner == 'kiegroup' + if: github.repository_owner == 'apache' concurrency: group: generate-status-page cancel-in-progress: true @@ -15,5 +15,5 @@ jobs: - name: Generate status page uses: kiegroup/chain-status/.ci/actions/generate-app@main with: - info-md-url: "https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/.ci/chain-status-info.md" + info-md-url: "https://raw.githubusercontent.com/apache/kogito-pipelines/main/.ci/chain-status-info.md" github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/generate_status_page_data.yaml b/.github/workflows/generate_status_page_data.yaml index c313cad67..293f7deb1 100644 --- a/.github/workflows/generate_status_page_data.yaml +++ b/.github/workflows/generate_status_page_data.yaml @@ -7,7 +7,7 @@ on: jobs: generate-status-page-data: - if: github.repository_owner == 'kiegroup' + if: github.repository_owner == 'apache' concurrency: group: generate-status-page-data cancel-in-progress: true @@ -32,7 +32,7 @@ jobs: with: projects: "${{ steps.retrieve_active_repos.outputs.result }}" title: Kogito Status - subtitle: Kiegroup Kogito organization repositories CI status + subtitle: Apache Kogito organization repositories CI status base-branch-filter: "${{ steps.retrieve_active_branches.outputs.result }}" branches: 1.13.x,1.13.x-blue created-by: GitHub Action diff --git a/.github/workflows/jenkins-dsl-downstream.yml b/.github/workflows/jenkins-dsl-downstream.yml index 30e2618bc..bc1d4f18f 100644 --- a/.github/workflows/jenkins-dsl-downstream.yml +++ b/.github/workflows/jenkins-dsl-downstream.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/kogito-pipelines + repository: apache/kogito-pipelines ref: main path: main_config_repo @@ -156,9 +156,9 @@ jobs: with: project: kogito repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/kogito-pipelines + main-config-file-repo: apache/kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/kogito-pipelines + branch-config-file-repo: apache/kogito-pipelines base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -193,7 +193,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/optaplanner + repository: apache/optaplanner ref: main path: main_config_repo @@ -320,9 +320,9 @@ jobs: with: project: optaplanner repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/optaplanner + main-config-file-repo: apache/optaplanner main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/optaplanner + branch-config-file-repo: apache/optaplanner base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -357,7 +357,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: kiegroup/drools + repository: apache/drools ref: main path: main_config_repo @@ -479,7 +479,7 @@ jobs: with: project: drools repository: ${{ matrix.repository }} - main-config-file-repo: kiegroup/drools + main-config-file-repo: apache/drools main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/drools + branch-config-file-repo: apache/drools base-branch: ${{ env.BASE_BRANCH }} diff --git a/.github/workflows/jenkins-tests.yml b/.github/workflows/jenkins-tests.yml index e774d6957..b054c37cc 100644 --- a/.github/workflows/jenkins-tests.yml +++ b/.github/workflows/jenkins-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout shared libraries uses: actions/checkout@v3 with: - repository: kiegroup/jenkins-pipeline-shared-libraries + repository: apache/jenkins-pipeline-shared-libraries path: shared-libs - name: Set up JDK 1.8 @@ -49,7 +49,7 @@ jobs: - name: DSL tests uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main with: - main-config-file-repo: kiegroup/kogito-pipelines + main-config-file-repo: apache/kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/kogito-pipelines + branch-config-file-repo: apache/kogito-pipelines \ No newline at end of file diff --git a/README.md b/README.md index a917bff3f..098a6dbe0 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ This repository contains some of the pipelines of Kogito project. Apart from this repository, pipelines are also concerning those repositories: -* [kogito-runtimes](https://github.com/kiegroup/kogito-runtimes) -* [kogito-apps](https://github.com/kiegroup/kogito-apps) -* [kogito-examples](https://github.com/kiegroup/kogito-examples) -* [kogito-images](https://github.com/kiegroup/kogito-images) -* [kogito-operator](https://github.com/kiegroup/kogito-operator) -* [kie-tools](https://github.com/kiegroup/kie-tools) +* [kogito-runtimes](https://github.com/apache/kogito-runtimes) +* [kogito-apps](https://github.com/apache/kogito-apps) +* [kogito-examples](https://github.com/apache/kogito-examples) +* [kogito-images](https://github.com/apache/kogito-images) +* [kogito-operator](https://github.com/apache/kogito-operator) +* [kie-tools](https://github.com/apache/kie-tools) # The different Kogito pipelines @@ -122,7 +122,7 @@ Jenkins PR checks are of 3 different types: Each repository has a different yaml files in `.github/workflows` folder to configure the workflow. -We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/kiegroup/kogito-pipelines/tree/main/.ci/actions). +We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/apache/kogito-pipelines/tree/main/.ci/actions). After the build, test results are parsed and logged using the [`action-surefire-report`](https://github.com/ScaCap/action-surefire-report) action. diff --git a/docs/jenkins.md b/docs/jenkins.md index 4d3033257..92dddc66c 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -257,7 +257,7 @@ Then, you can also add a small `.ci/jenkins/dsl/test.sh` to test your groovy scr file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ ``` @@ -290,7 +290,7 @@ If you don't have access to the Kogito `0-seed-job`, you can also create one bas 3) Copy the create the `0-seed-job` and point the parameters of the job to the main config file you created. Depending on what you changed and need to test, you may have different parameters to update: * Setup `SEED_CONFIG_FILE_*` parameters correctly to the author/branch you pushed your test modifications. This is always required. - * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `kiegroup/main`. + * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `apache/main`. 4) Launch the `0-seed-job` and it should create all the needed jobs **Again, please make sure that you setup your own configuration !** diff --git a/docs/nightly pipeline.md b/docs/nightly pipeline.md index 1337390f3..768ff48e3 100644 --- a/docs/nightly pipeline.md +++ b/docs/nightly pipeline.md @@ -17,18 +17,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) ## Nightly pipeline Architecture diff --git a/docs/release pipeline.md b/docs/release pipeline.md index a4174a0c6..5b5cdd551 100644 --- a/docs/release pipeline.md +++ b/docs/release pipeline.md @@ -38,18 +38,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/kiegroup/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/kiegroup/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/kiegroup/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/kiegroup/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/kiegroup/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) ## Release process @@ -159,7 +159,7 @@ Once the Release Pipeline is finished, there are some actions to be done: ##### Operator Crd/Csv files -Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/kiegroup/kogito-operator). +Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/apache/kogito-operator). You will need to create, with those files, new OperatorHub PRs (one for Openshift and one for Kubernetes) or asked someone from Cloud part to do it. If there is any change to be done due to PRs, do it on the release branch. @@ -189,7 +189,7 @@ To deploy only artifacts (without Cloud part), you should start the release pipe To deploy only the Cloud part, you should start the release pipeline with those parameters: -* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/kiegroup/kogito-examples) +* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/apache/kogito-examples) * EXAMPLES_REF => point to current release branch * SKIP_ARTIFACTS_DEPLOY => checked * SKIP_ARTIFACTS_PROMOTE => checked diff --git a/dsl/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy index 5a0437005..9d0620f43 100644 --- a/dsl/scripts/pr_check.groovy +++ b/dsl/scripts/pr_check.groovy @@ -92,7 +92,7 @@ String getBuildChainCommandline() { String buildChainProject = env.BUILDCHAIN_PROJECT ?: CHANGE_REPO String buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' String buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' - String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:kiegroup}' + String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' String buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' List buildChainAdditionalArguments = [ diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain index 034af638f..6dd2ad6d2 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain @@ -24,7 +24,7 @@ downstreamBuild = env.DOWNSTREAM_BUILD ? env.DOWNSTREAM_BUILD.toBoolean() : fals buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' -buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:kiegroup}' +buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' buildChainAction = isFDBBuildChainType() ? 'full_downstream' : buildChainType buildChainAdditionalArguments = buildChainProject ? [ "-p ${buildChainProject}" ] : [] @@ -228,9 +228,9 @@ String getProjectFolder() { // First guessing whether there is a clone defined into the buildchain config // If not, fallback to simple folder structure - String projectFolder = "bc/kiegroup_${project}/${project}" + String projectFolder = "bc/apache_${project}/${project}" if (!fileExists(projectFolder)) { - projectFolder = "bc/kiegroup_${project}" + projectFolder = "bc/apache_${project}" } return projectFolder diff --git a/dsl/seed/jobs/seed_job_branch.groovy b/dsl/seed/jobs/seed_job_branch.groovy index 976e6c935..edad4ecb9 100644 --- a/dsl/seed/jobs/seed_job_branch.groovy +++ b/dsl/seed/jobs/seed_job_branch.groovy @@ -45,7 +45,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob("${GENERATION_BRANCH}/${JOB_NAME}") { - description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") + description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") logRotator { numToKeep(5) diff --git a/dsl/seed/jobs/seed_job_main.groovy b/dsl/seed/jobs/seed_job_main.groovy index 4265c4396..80188355c 100644 --- a/dsl/seed/jobs/seed_job_main.groovy +++ b/dsl/seed/jobs/seed_job_main.groovy @@ -11,7 +11,7 @@ String getSeedRepo() { } String getSeedAuthor() { - return Utils.getSeedAuthor(this) ?: 'kiegroup' + return Utils.getSeedAuthor(this) ?: 'apache' } String getSeedAuthorCredsId() { @@ -27,7 +27,7 @@ String getSeedConfigFileGitRepository() { } String getSeedConfigFileGitAuthorName() { - return SEED_CONFIG_FILE_GIT_AUTHOR_NAME ?: 'kiegroup' + return SEED_CONFIG_FILE_GIT_AUTHOR_NAME ?: 'apache' } String getSeedConfigFileGitAuthorCredsId() { @@ -72,7 +72,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob('0-seed-job') { - description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/dsl/seed/scripts/seed_test.sh b/dsl/seed/scripts/seed_test.sh index e0e36809f..c148f47dd 100755 --- a/dsl/seed/scripts/seed_test.sh +++ b/dsl/seed/scripts/seed_test.sh @@ -6,7 +6,7 @@ # #!/bin/bash -e # file=$(mktemp) # # For more usage of the script, use ./test.sh -h -# curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +# curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh # chmod u+x ${file} # ${file} $@ @@ -24,7 +24,7 @@ usage() { echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REPO Main config file repository (owner/repo)' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REF Main config file reference' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_PATH Main config file path. Default is `.ci/jenkins/config/main.yaml`' - echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `kiegroup/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `apache/kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF Fallback main config reference. Default is `main`' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_LOCAL_PATH Main config file local path. If set, the other `DSL_DEFAULT_MAIN_CONFIG_FILE_*` envs will be ignored' echo @@ -39,7 +39,7 @@ usage() { echo ' DSL_DEFAULT_SEED_REPO DSL seed repository (owner/repo). Else it will be calculated from the test repository.' echo ' DSL_DEFAULT_SEED_REF DSL seed reference. Else it will be calculated from the branch config' echo ' DSL_DEFAULT_SEED_REPO_LOCAL_PATH DSL seed repository local path. If set, the other `DSL_DEFAULT_SEED_*` envs will be ignored' - echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `kiegroup/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `apache/kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_SEED_REF Fallback seed reference. Default is `main`' echo echo ' Test repository configuration:' @@ -179,9 +179,9 @@ branch_config_file_ref=${DSL_DEFAULT_BRANCH_CONFIG_FILE_REF} branch_config_file_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_PATH} branch_config_file_local_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_LOCAL_PATH:-''} -fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'kiegroup/kogito-pipelines'} +fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} fallback_main_config_file_ref=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF:-'main'} -fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'kiegroup/kogito-pipelines'} +fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} fallback_branch_config_file_ref=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REF:-'main'} fallback_branch_config_name="${fallback_main_config_file_ref}" @@ -315,7 +315,7 @@ seed_repo=${DSL_DEFAULT_SEED_REPO} seed_ref=${DSL_DEFAULT_SEED_REF} seed_local_path=${DSL_DEFAULT_SEED_REPO_LOCAL_PATH} -fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'kiegroup/kogito-pipelines'} +fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'apache/kogito-pipelines'} fallback_seed_ref=${DSL_DEFAULT_FALLBACK_SEED_REF} if [ -z ${fallback_seed_ref} ]; then fallback_seed_ref="$(yq -e ".git.branches[] | select(.name == \"${branch_config_name}\") | .seed.branch" ${main_config_file_path} 2> /dev/null)" diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy index 7fbb5dad8..19ea788dd 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy @@ -183,13 +183,13 @@ class KogitoJobTemplate { jobParams.pr.putAll ([ run_only_for_labels: (jobParams.pr.run_only_for_labels ?: []) + [KogitoConstants.LABEL_DSL_TEST], run_only_for_branches: [ jobParams.git.repository == 'optaplanner-quickstarts' ? 'development' : 'main' ], - authorized_users: [ 'kiegroup' ], - authorized_groups: [ 'kiegroup' ], + authorized_users: [ 'apache' ], + authorized_groups: [ 'apache' ], ]) // Enable PR test only if main branch if (Utils.isMainBranch(script)) { - jobParams.git.project_url = "https://github.com/kiegroup/${jobParams.pr.target_repository ?: jobParams.git.repository}/" + jobParams.git.project_url = "https://github.com/apache/${jobParams.pr.target_repository ?: jobParams.git.repository}/" } } diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy index 4038e826b..ae50474da 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy @@ -98,9 +98,9 @@ class Utils { static boolean isProdEnvironment(def script) { // Check for all possible `GIT_AUTHOR_NAME` variables - return getSeedAuthor(script) == 'kiegroup' && - (hasGitAuthor(script) ? getGitAuthor(script) == 'kiegroup' : true) && - (hasSeedConfigFileGitAuthor(script) ? getSeedConfigFileGitAuthor(script) == 'kiegroup' : true) + return getSeedAuthor(script) == 'kieapachegroup' && + (hasGitAuthor(script) ? getGitAuthor(script) == 'apache' : true) && + (hasSeedConfigFileGitAuthor(script) ? getSeedConfigFileGitAuthor(script) == 'apache' : true) } static boolean isTestEnvironment(def script) { diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy index ad0ed171f..7e6770b3b 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy @@ -138,7 +138,7 @@ class JobParamsUtils { setupJobParamsAgentDockerBuilderImageConfiguration(script, jobParams) jobParams.env = jobParams.env ?: [:] jobParams.env.putAll([ - BUILDCHAIN_PROJECT: "kiegroup/${repository}", + BUILDCHAIN_PROJECT: "apache/${repository}", BUILDCHAIN_TYPE: buildchainType, BUILDCHAIN_CONFIG_REPO: Utils.getBuildChainConfigRepo(script) ?: Utils.getSeedRepo(script), BUILDCHAIN_CONFIG_AUTHOR: Utils.getBuildChainConfigAuthor(script) ?: Utils.getSeedAuthor(script), diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy index 2f53892a6..86089d381 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy @@ -15,7 +15,7 @@ class SeedJobUtils { throw new RuntimeException('pathsToListen cannot be empty, else it would end up in an infinite loop ...'); } def job = jenkinsScript.pipelineJob(jobName) { - description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/kiegroup/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/tools/update-kie7-version.sh b/tools/update-kie7-version.sh index a1582c1c3..831030198 100755 --- a/tools/update-kie7-version.sh +++ b/tools/update-kie7-version.sh @@ -85,7 +85,7 @@ if [ "$FORK" = "" ]; then fi REPO=kogito-runtimes -ORIGIN=kiegroup/$REPO +ORIGIN=apache/$REPO PR_FORK=$FORK/$REPO PR_BRANCH=${BRANCH}-bump-${PREFIX}kie-$KIE_VERSION @@ -120,7 +120,7 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/kiegroup/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi diff --git a/tools/update-quarkus-versions.sh b/tools/update-quarkus-versions.sh index ad4cf80a0..44880659c 100755 --- a/tools/update-quarkus-versions.sh +++ b/tools/update-quarkus-versions.sh @@ -113,7 +113,7 @@ if [ "$FORK" = "" ]; then exit 2 fi -ORIGIN=kiegroup/$REPO +ORIGIN=apache/$REPO PR_FORK=$FORK/$REPO PR_BRANCH=${BRANCH}-bump-quarkus-$QUARKUS_VERSION @@ -183,6 +183,6 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/kiegroup/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi \ No newline at end of file From 36fc9d430d356fc547ae9780c86e77a155a51cea Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 15:56:33 +0200 Subject: [PATCH 03/10] update --- .ci/jenkins/config/branch.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 06ba84afe..d7ba839c6 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -56,8 +56,10 @@ repositories: git: author: name: apache - credentials_id: kie-ci3 - token_credentials_id: kie-ci3-token + # Taken from https://ci-builds.apache.org/credentials/ + # Need to be verified + credentials_id: 399061d0-5ab5-4142-a186-a52081fef742 + token_credentials_id: ci-builds fork_author: name: kie-ci credentials_id: kie-ci From 9de8122f27dd5ca9babc034ce4a9f2649cf348fe Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 16:10:15 +0200 Subject: [PATCH 04/10] correction --- .ci/jenkins/config/branch.yaml | 4 +--- .ci/jenkins/config/main.yaml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index d7ba839c6..ff5b01a11 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -49,10 +49,8 @@ repositories: - name: kogito-serverless-operator - name: kogito-docs - name: kie-tools - author: - name: radtriste # TODO set back. Could not push to kiegroup - name: kie-docs - # branch: main-kogito # TODO kie-docs PR should be against `main-kogito` + branch: main-kogito git: author: name: apache diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml index 889fd7175..7b45e407d 100644 --- a/.ci/jenkins/config/main.yaml +++ b/.ci/jenkins/config/main.yaml @@ -17,7 +17,7 @@ ecosystem: - kie-docs.* git: branches: - - name: apache_migration + - name: main main_branch: true seed: config_file: @@ -26,7 +26,7 @@ seed: author: name: apache credentials_id: kie-ci3 - branch: apache_migration + branch: main path: .ci/jenkins/config/branch.yaml jenkinsfile: dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch jenkins: From 6b80b2d63da33b3f1d6fa7755a8730e05f33cf10 Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 11 Sep 2023 10:28:25 +0200 Subject: [PATCH 05/10] correction --- .ci/chain-status-info.md | 2 +- .ci/jenkins/tests/setup_pipeline_env.sh | 2 +- .github/workflows/jenkins-tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/chain-status-info.md b/.ci/chain-status-info.md index 94e5239a3..4b386bb53 100644 --- a/.ci/chain-status-info.md +++ b/.ci/chain-status-info.md @@ -2,4 +2,4 @@ This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/apache/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). -Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/apache/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. +Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/kiegroup/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. diff --git a/.ci/jenkins/tests/setup_pipeline_env.sh b/.ci/jenkins/tests/setup_pipeline_env.sh index c49492089..8943da04e 100755 --- a/.ci/jenkins/tests/setup_pipeline_env.sh +++ b/.ci/jenkins/tests/setup_pipeline_env.sh @@ -5,7 +5,7 @@ author=$1 branch=$2 if [ -z $author ]; then - author='apache' + author='kiegroup' fi if [ -z $branch ]; then diff --git a/.github/workflows/jenkins-tests.yml b/.github/workflows/jenkins-tests.yml index b054c37cc..a2ed520bc 100644 --- a/.github/workflows/jenkins-tests.yml +++ b/.github/workflows/jenkins-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout shared libraries uses: actions/checkout@v3 with: - repository: apache/jenkins-pipeline-shared-libraries + repository: kiegroup/jenkins-pipeline-shared-libraries path: shared-libs - name: Set up JDK 1.8 From ff023b4b09df91fb72979b1ecfd11c2f6580e225 Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 11 Sep 2023 13:51:45 +0200 Subject: [PATCH 06/10] update references --- .ci/actions/build-chain/action.yml | 2 +- .ci/actions/dsl-tests/action.yml | 2 +- .ci/actions/os-preparation/action.yaml | 2 +- .ci/chain-status-info.md | 2 +- .ci/jenkins/Jenkinsfile.nightly.cloud | 4 +-- .ci/jenkins/Jenkinsfile.release.cloud | 4 +-- .ci/project-dependencies.yaml | 34 +++++++++---------- .ci/pull-request-config.yaml | 10 +++--- .github/workflows/generate_status_page.yaml | 2 +- .github/workflows/jenkins-dsl-downstream.yml | 18 +++++----- .github/workflows/jenkins-tests.yml | 4 +-- README.md | 14 ++++---- docs/jenkins.md | 8 ++--- docs/nightly pipeline.md | 24 ++++++------- docs/release pipeline.md | 28 +++++++-------- dsl/seed/jobs/seed_job_branch.groovy | 2 +- dsl/seed/jobs/seed_job_main.groovy | 2 +- dsl/seed/scripts/seed_test.sh | 12 +++---- .../jenkins/jobdsl/utils/SeedJobUtils.groovy | 2 +- tools/update-kie7-version.sh | 2 +- tools/update-quarkus-versions.sh | 2 +- 21 files changed, 88 insertions(+), 92 deletions(-) diff --git a/.ci/actions/build-chain/action.yml b/.ci/actions/build-chain/action.yml index b8a5fc03a..83a78dab4 100644 --- a/.ci/actions/build-chain/action.yml +++ b/.ci/actions/build-chain/action.yml @@ -7,7 +7,7 @@ inputs: definition-file: description: 'The `definition-file` input for the build-chain' required: false - default: 'https://raw.githubusercontent.com/${GROUP:apache}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' + default: 'https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml' flow-type: description: "the flow to execute, it can be 'cross_pr' (or 'pull-request' which is deprecated), 'full_downstream' (or 'full-downstream' which is deprecated), 'single_pr' (or 'single' which is deprecated) or 'branch'" default: "cross_pr" diff --git a/.ci/actions/dsl-tests/action.yml b/.ci/actions/dsl-tests/action.yml index 09a09d8c7..c693a8eb0 100644 --- a/.ci/actions/dsl-tests/action.yml +++ b/.ci/actions/dsl-tests/action.yml @@ -46,7 +46,7 @@ runs: - name: Checkout Seed repo uses: actions/checkout@v3 with: - repository: apache/kogito-pipelines + repository: apache/incubator-kie-kogito-pipelines ref: main path: seed_repo diff --git a/.ci/actions/os-preparation/action.yaml b/.ci/actions/os-preparation/action.yaml index a7fbd811e..af8004d76 100644 --- a/.ci/actions/os-preparation/action.yaml +++ b/.ci/actions/os-preparation/action.yaml @@ -5,7 +5,7 @@ inputs: repository: description: "The repository containing the matrix-os.json os configuration" required: false - default: "apache/kogito-pipelines" + default: "apache/incubator-kie-kogito-pipelines" branch: description: "The repository branch from which the matrix configuration must be taken" required: false diff --git a/.ci/chain-status-info.md b/.ci/chain-status-info.md index 4b386bb53..fe3a3be33 100644 --- a/.ci/chain-status-info.md +++ b/.ci/chain-status-info.md @@ -1,5 +1,5 @@ # Kiegroup Kogito organization repositories CI Status -This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/apache/kogito-pipelines/blob/main/.ci/pull-request-config.yaml). +This project is based on [chain-status](https://github.com/kiegroup/chain-status) and information generated thanks to [build-chain-configuration-reader](https://github.com/kiegroup/build-chain-configuration-reader) using [kogito-pipelines definition file](https://github.com/apache/incubator-kie-kogito-pipelines/blob/main/.ci/pull-request-config.yaml). Due to the retrieved information requires a `GITHUB_TOKEN` and github API has a limitation it is better to not collect the information on every request from this webpage is made. So this webpage does not really requires an application service and all the required data is stored in github pages. This information is normally retrieved, treated and stored using [chain-status/action tool](https://github.com/kiegroup/chain-status/tree/main/packages/action) which is exposed as a Github Action tool, so we can customize the job execution frequency as we need. diff --git a/.ci/jenkins/Jenkinsfile.nightly.cloud b/.ci/jenkins/Jenkinsfile.nightly.cloud index f3f5d0b81..fc6e572ea 100644 --- a/.ci/jenkins/Jenkinsfile.nightly.cloud +++ b/.ci/jenkins/Jenkinsfile.nightly.cloud @@ -266,11 +266,11 @@ void addSkipIntegrationTestsParam(buildParams) { void addAppsParam(buildParams) { addStringParam(buildParams, 'APPS_REF', "${getBuildBranch()}") - addStringParam(buildParams, 'APPS_URI', "https://github.com/${getGitAuthor()}/kogito-apps") + addStringParam(buildParams, 'APPS_URI', "https://github.com/${getGitAuthor()}/incubator-kie-kogito-apps") } void addExamplesParam(buildParams) { - addStringParam(buildParams, 'EXAMPLES_URI', "https://github.com/${getGitAuthor()}/kogito-examples") + addStringParam(buildParams, 'EXAMPLES_URI', "https://github.com/${getGitAuthor()}/incubator-kie-kogito-examples") addStringParam(buildParams, 'EXAMPLES_REF', "nightly-${getBuildBranch()}") } diff --git a/.ci/jenkins/Jenkinsfile.release.cloud b/.ci/jenkins/Jenkinsfile.release.cloud index c9cd756e7..7019f1491 100644 --- a/.ci/jenkins/Jenkinsfile.release.cloud +++ b/.ci/jenkins/Jenkinsfile.release.cloud @@ -72,9 +72,9 @@ pipeline { stage('Setup configuration for testing') { steps { script { - env.EXAMPLES_URI = params.EXAMPLES_URI ?: (getReleaseProperty('examples.uri') ?: "https://github.com/${getGitAuthor()}/kogito-examples") + env.EXAMPLES_URI = params.EXAMPLES_URI ?: (getReleaseProperty('examples.uri') ?: "https://github.com/${getGitAuthor()}/incubator-kie-kogito-examples") env.EXAMPLES_REF = params.EXAMPLES_REF ?: (getReleaseProperty('examples.ref') ?: getKogitoVersion()) - env.APPS_URI = params.APPS_URI ?: (getReleaseProperty('apps.uri') ?: "https://github.com/${getGitAuthor()}/kogito-apps") + env.APPS_URI = params.APPS_URI ?: (getReleaseProperty('apps.uri') ?: "https://github.com/${getGitAuthor()}/incubator-kie-kogito-apps") env.APPS_REF = params.APPS_REF ?: (getReleaseProperty('apps.ref') ?: getKogitoVersion()) echo "Got examples uri ${env.EXAMPLES_URI}" diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml index 5b8c6abb2..3734970da 100644 --- a/.ci/project-dependencies.yaml +++ b/.ci/project-dependencies.yaml @@ -1,6 +1,6 @@ version: "2.1" dependencies: - - project: apache/drools + - project: apache/incubator-kie-drools mapping: dependencies: default: @@ -11,11 +11,11 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" exclude: - - apache/kie-jpmml-integration + - kiegroup/kie-jpmml-integration - - project: apache/kogito-runtimes + - project: apache/incubator-kie-kogito-runtimes dependencies: - - project: apache/drools + - project: apache/incubator-kie-drools mapping: dependencies: default: @@ -26,12 +26,12 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - apache/kogito-examples - - apache/kogito-apps + - apache/incubator-kie-kogito-examples + - apache/incubator-kie-kogito-apps - - project: apache/kogito-apps + - project: apache/incubator-kie-kogito-apps dependencies: - - project: apache/kogito-runtimes + - project: apache/incubator-kie-kogito-runtimes mapping: dependencies: default: @@ -42,13 +42,13 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - apache/kogito-examples - - apache/kogito-runtimes + - apache/incubator-kie-kogito-examples + - apache/incubator-kie-kogito-runtimes - - project: apache/kogito-examples + - project: apache/incubator-kie-kogito-examples dependencies: - - project: apache/kogito-runtimes - - project: apache/kogito-apps + - project: apache/incubator-kie-kogito-runtimes + - project: apache/incubator-kie-kogito-apps mapping: dependencies: default: @@ -59,9 +59,9 @@ dependencies: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" exclude: - - apache/kogito-apps - - apache/kogito-runtimes - - project: apache/kie-jpmml-integration + - apache/incubator-kie-kogito-apps + - apache/incubator-kie-kogito-runtimes + - project: kiegroup/kie-jpmml-integration dependencies: - - project: apache/drools + - project: apache/incubator-kie-drools # no mapping needed diff --git a/.ci/pull-request-config.yaml b/.ci/pull-request-config.yaml index 0875f98ef..4a014882b 100644 --- a/.ci/pull-request-config.yaml +++ b/.ci/pull-request-config.yaml @@ -25,7 +25,7 @@ default: mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} build: - - project: apache/drools + - project: apache/incubator-kie-drools build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.DROOLS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -33,7 +33,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.DROOLS_BUILD_MVN_OPTS_UPSTREAM }} - - project: apache/kogito-runtimes + - project: apache/incubator-kie-kogito-runtimes build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_RUNTIMES_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -41,7 +41,7 @@ build: upstream: | mvn dependency:tree clean install -Dquickly -Dfull ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM }} - - project: apache/kogito-apps + - project: apache/incubator-kie-kogito-apps build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KOGITO_APPS_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` @@ -54,7 +54,7 @@ build: **/cypress/screenshots/** **/cypress/videos/** - - project: apache/kogito-examples + - project: apache/incubator-kie-kogito-examples build-command: # First install the main pom # Then build the required submodule pom @@ -65,7 +65,7 @@ build: upstream: | mvn dependency:tree clean install -DskipTests -DskipITs ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_EXAMPLES_BUILD_MVN_OPTS_UPSTREAM }} - - project: apache/kie-jpmml-integration + - project: kiegroup/kie-jpmml-integration build-command: current: | export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` diff --git a/.github/workflows/generate_status_page.yaml b/.github/workflows/generate_status_page.yaml index 9e76f3afa..008392828 100644 --- a/.github/workflows/generate_status_page.yaml +++ b/.github/workflows/generate_status_page.yaml @@ -15,5 +15,5 @@ jobs: - name: Generate status page uses: kiegroup/chain-status/.ci/actions/generate-app@main with: - info-md-url: "https://raw.githubusercontent.com/apache/kogito-pipelines/main/.ci/chain-status-info.md" + info-md-url: "https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/.ci/chain-status-info.md" github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/jenkins-dsl-downstream.yml b/.github/workflows/jenkins-dsl-downstream.yml index bc1d4f18f..2cc1e9165 100644 --- a/.github/workflows/jenkins-dsl-downstream.yml +++ b/.github/workflows/jenkins-dsl-downstream.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: apache/kogito-pipelines + repository: apache/incubator-kie-kogito-pipelines ref: main path: main_config_repo @@ -156,9 +156,9 @@ jobs: with: project: kogito repository: ${{ matrix.repository }} - main-config-file-repo: apache/kogito-pipelines + main-config-file-repo: apache/incubator-kie-kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: apache/kogito-pipelines + branch-config-file-repo: apache/incubator-kie-kogito-pipelines base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -193,7 +193,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: apache/optaplanner + repository: apache/incubator-kie-optaplanner ref: main path: main_config_repo @@ -320,9 +320,9 @@ jobs: with: project: optaplanner repository: ${{ matrix.repository }} - main-config-file-repo: apache/optaplanner + main-config-file-repo: apache/incubator-kie-optaplanner main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: apache/optaplanner + branch-config-file-repo: apache/incubator-kie-optaplanner base-branch: ${{ env.BASE_BRANCH }} ############################################################################# @@ -357,7 +357,7 @@ jobs: - name: Checkout Main Config repo from main branch uses: actions/checkout@v3 with: - repository: apache/drools + repository: apache/incubator-kie-drools ref: main path: main_config_repo @@ -479,7 +479,7 @@ jobs: with: project: drools repository: ${{ matrix.repository }} - main-config-file-repo: apache/drools + main-config-file-repo: apache/incubator-kie-drools main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: apache/drools + branch-config-file-repo: apache/incubator-kie-drools base-branch: ${{ env.BASE_BRANCH }} diff --git a/.github/workflows/jenkins-tests.yml b/.github/workflows/jenkins-tests.yml index a2ed520bc..7624e4394 100644 --- a/.github/workflows/jenkins-tests.yml +++ b/.github/workflows/jenkins-tests.yml @@ -49,7 +49,7 @@ jobs: - name: DSL tests uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main with: - main-config-file-repo: apache/kogito-pipelines + main-config-file-repo: apache/incubator-kie-kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: apache/kogito-pipelines + branch-config-file-repo: apache/incubator-kie-kogito-pipelines \ No newline at end of file diff --git a/README.md b/README.md index 098a6dbe0..dc071e71a 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ This repository contains some of the pipelines of Kogito project. Apart from this repository, pipelines are also concerning those repositories: -* [kogito-runtimes](https://github.com/apache/kogito-runtimes) -* [kogito-apps](https://github.com/apache/kogito-apps) -* [kogito-examples](https://github.com/apache/kogito-examples) -* [kogito-images](https://github.com/apache/kogito-images) -* [kogito-operator](https://github.com/apache/kogito-operator) -* [kie-tools](https://github.com/apache/kie-tools) +* [kogito-runtimes](https://github.com/apache/incubator-kie-kogito-runtimes) +* [kogito-apps](https://github.com/apache/incubator-kie-kogito-apps) +* [kogito-examples](https://github.com/apache/incubator-kie-kogito-examples) +* [kogito-images](https://github.com/apache/incubator-kie-kogito-images) +* [kogito-operator](https://github.com/apache/incubator-kie-kogito-operator) +* [kie-tools](https://github.com/apache/incubator-kie-kie-tools) # The different Kogito pipelines @@ -122,7 +122,7 @@ Jenkins PR checks are of 3 different types: Each repository has a different yaml files in `.github/workflows` folder to configure the workflow. -We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/apache/kogito-pipelines/tree/main/.ci/actions). +We are additionally using [`composite actions`](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action) to centralized most common steps used by the different Kogito repositories' jobs. You can check the different kind of composite actions we have available at [`.ci/actions` folder](https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/.ci/actions). After the build, test results are parsed and logged using the [`action-surefire-report`](https://github.com/ScaCap/action-surefire-report) action. diff --git a/docs/jenkins.md b/docs/jenkins.md index 92dddc66c..89767f6f9 100644 --- a/docs/jenkins.md +++ b/docs/jenkins.md @@ -183,10 +183,6 @@ maven: build_promotion_profile_id: 1966c60aff37d artifacts_repository: http://nexus3-tradisso-nexus.apps.kogito-cloud.hosted.psi.rdu2.redhat.com/repository/kogito-test/ #artifacts_repository: '' - pr_checks: - repository: - url: https://bxms-qe.rhev-ci-vms.eng.rdu2.redhat.com:8443/nexus/content/repositories/kogito-runtimes-pr-full-testing/ - creds_id: unpacks-zip-on-qa-nexus cloud: image: registry_credentials_nightly: tradisso_registry_token @@ -257,7 +253,7 @@ Then, you can also add a small `.ci/jenkins/dsl/test.sh` to test your groovy scr file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ ``` @@ -290,7 +286,7 @@ If you don't have access to the Kogito `0-seed-job`, you can also create one bas 3) Copy the create the `0-seed-job` and point the parameters of the job to the main config file you created. Depending on what you changed and need to test, you may have different parameters to update: * Setup `SEED_CONFIG_FILE_*` parameters correctly to the author/branch you pushed your test modifications. This is always required. - * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `apache/main`. + * Change the `SEED_*` parameters only if you did some changes in the Kogito Pipelines `dsl/seed` folder. Else you can use the default, aka `apache/incubator-kie-main`. 4) Launch the `0-seed-job` and it should create all the needed jobs **Again, please make sure that you setup your own configuration !** diff --git a/docs/nightly pipeline.md b/docs/nightly pipeline.md index 768ff48e3..487f54625 100644 --- a/docs/nightly pipeline.md +++ b/docs/nightly pipeline.md @@ -17,18 +17,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/incubator-kie-kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/incubator-kie-kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/incubator-kie-kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/incubator-kie-kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/incubator-kie-kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/incubator-kie-kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/incubator-kie-kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/incubator-kie-kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.promote) ## Nightly pipeline Architecture diff --git a/docs/release pipeline.md b/docs/release pipeline.md index 5b5cdd551..8f1a1d79f 100644 --- a/docs/release pipeline.md +++ b/docs/release pipeline.md @@ -38,18 +38,18 @@ Those jobs should be present at the same level as the nightly and/or release job Here is the list of jobs and link to Jenkinsfiles: -* [kogito-runtimes-deploy](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.deploy) -* [kogito-runtimes-promote](https://github.com/apache/kogito-runtimes/blob/main/Jenkinsfile.promote) -* [kogito-apps-deploy](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.deploy) -* [kogito-apps-promote](https://github.com/apache/kogito-apps/blob/main/Jenkinsfile.promote) -* [kogito-examples-deploy](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.deploy) -* [kogito-examples-promote](https://github.com/apache/kogito-examples/blob/main/Jenkinsfile.promote) -* [kogito-images-deploy](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.deploy) -* [kogito-images-promote](https://github.com/apache/kogito-images/blob/main/Jenkinsfile.promote) -* [kogito-examples-images-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) -* [kogito-examples-images-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.examples-images.promote) -* [kogito-operator-deploy](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.deploy) -* [kogito-operator-promote](https://github.com/apache/kogito-operator/blob/main/Jenkinsfile.promote) +* [kogito-runtimes-deploy](https://github.com/apache/incubator-kie-kogito-runtimes/blob/main/Jenkinsfile.deploy) +* [kogito-runtimes-promote](https://github.com/apache/incubator-kie-kogito-runtimes/blob/main/Jenkinsfile.promote) +* [kogito-apps-deploy](https://github.com/apache/incubator-kie-kogito-apps/blob/main/Jenkinsfile.deploy) +* [kogito-apps-promote](https://github.com/apache/incubator-kie-kogito-apps/blob/main/Jenkinsfile.promote) +* [kogito-examples-deploy](https://github.com/apache/incubator-kie-kogito-examples/blob/main/Jenkinsfile.deploy) +* [kogito-examples-promote](https://github.com/apache/incubator-kie-kogito-examples/blob/main/Jenkinsfile.promote) +* [kogito-images-deploy](https://github.com/apache/incubator-kie-kogito-images/blob/main/Jenkinsfile.deploy) +* [kogito-images-promote](https://github.com/apache/incubator-kie-kogito-images/blob/main/Jenkinsfile.promote) +* [kogito-examples-images-deploy](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.examples-images.deploy) +* [kogito-examples-images-promote](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.examples-images.promote) +* [kogito-operator-deploy](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.deploy) +* [kogito-operator-promote](https://github.com/apache/incubator-kie-kogito-operator/blob/main/Jenkinsfile.promote) ## Release process @@ -159,7 +159,7 @@ Once the Release Pipeline is finished, there are some actions to be done: ##### Operator Crd/Csv files -Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/apache/kogito-operator). +Once the operator's release has been done, it created new csv and crd files under `deploy/olm-catalog/kogito-operator/{VERSION}` on the release branch in [kogito-operator](https://github.com/apache/incubator-kie-kogito-operator). You will need to create, with those files, new OperatorHub PRs (one for Openshift and one for Kubernetes) or asked someone from Cloud part to do it. If there is any change to be done due to PRs, do it on the release branch. @@ -189,7 +189,7 @@ To deploy only artifacts (without Cloud part), you should start the release pipe To deploy only the Cloud part, you should start the release pipeline with those parameters: -* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/apache/kogito-examples) +* EXAMPLES_URI => point to `kogito-examples` repository (https://github.com/apache/incubator-kie-kogito-examples) * EXAMPLES_REF => point to current release branch * SKIP_ARTIFACTS_DEPLOY => checked * SKIP_ARTIFACTS_PROMOTE => checked diff --git a/dsl/seed/jobs/seed_job_branch.groovy b/dsl/seed/jobs/seed_job_branch.groovy index edad4ecb9..fd30e8505 100644 --- a/dsl/seed/jobs/seed_job_branch.groovy +++ b/dsl/seed/jobs/seed_job_branch.groovy @@ -45,7 +45,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob("${GENERATION_BRANCH}/${JOB_NAME}") { - description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") + description("This job creates all needed Jenkins jobs on branch ${GENERATION_BRANCH}. DO NOT USE FOR TESTING !!!! See https://github.com/apache/incubator-kie-kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs") logRotator { numToKeep(5) diff --git a/dsl/seed/jobs/seed_job_main.groovy b/dsl/seed/jobs/seed_job_main.groovy index 80188355c..4677ee7da 100644 --- a/dsl/seed/jobs/seed_job_main.groovy +++ b/dsl/seed/jobs/seed_job_main.groovy @@ -72,7 +72,7 @@ SeedJobUtils.createSeedJobTrigger( // Configuration of the seed and generated jobs is done via `dsl/seed/config.yaml` pipelineJob('0-seed-job') { - description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job creates all needed Jenkins jobs. DO NOT USE FOR TESTING !!!! See https://github.com/apache/incubator-kie-kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/dsl/seed/scripts/seed_test.sh b/dsl/seed/scripts/seed_test.sh index c148f47dd..d5d01343b 100755 --- a/dsl/seed/scripts/seed_test.sh +++ b/dsl/seed/scripts/seed_test.sh @@ -6,7 +6,7 @@ # #!/bin/bash -e # file=$(mktemp) # # For more usage of the script, use ./test.sh -h -# curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +# curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh # chmod u+x ${file} # ${file} $@ @@ -24,7 +24,7 @@ usage() { echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REPO Main config file repository (owner/repo)' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_REF Main config file reference' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_PATH Main config file path. Default is `.ci/jenkins/config/main.yaml`' - echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `apache/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO Fallback main config repository (owner/repo). Default is `apache/incubator-kie-kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF Fallback main config reference. Default is `main`' echo ' DSL_DEFAULT_MAIN_CONFIG_FILE_LOCAL_PATH Main config file local path. If set, the other `DSL_DEFAULT_MAIN_CONFIG_FILE_*` envs will be ignored' echo @@ -39,7 +39,7 @@ usage() { echo ' DSL_DEFAULT_SEED_REPO DSL seed repository (owner/repo). Else it will be calculated from the test repository.' echo ' DSL_DEFAULT_SEED_REF DSL seed reference. Else it will be calculated from the branch config' echo ' DSL_DEFAULT_SEED_REPO_LOCAL_PATH DSL seed repository local path. If set, the other `DSL_DEFAULT_SEED_*` envs will be ignored' - echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `apache/kogito-pipelines`' + echo ' DSL_DEFAULT_FALLBACK_SEED_REPO Fallback seed repository (owner/repo). Default is `apache/incubator-kie-kogito-pipelines`' echo ' DSL_DEFAULT_FALLBACK_SEED_REF Fallback seed reference. Default is `main`' echo echo ' Test repository configuration:' @@ -179,9 +179,9 @@ branch_config_file_ref=${DSL_DEFAULT_BRANCH_CONFIG_FILE_REF} branch_config_file_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_PATH} branch_config_file_local_path=${DSL_DEFAULT_BRANCH_CONFIG_FILE_LOCAL_PATH:-''} -fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} +fallback_main_config_file_repo=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO:-'apache/incubator-kie-kogito-pipelines'} fallback_main_config_file_ref=${DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REF:-'main'} -fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'apache/kogito-pipelines'} +fallback_branch_config_file_repo=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REPO:-'apache/incubator-kie-kogito-pipelines'} fallback_branch_config_file_ref=${DSL_DEFAULT_FALLBACK_BRANCH_CONFIG_FILE_REF:-'main'} fallback_branch_config_name="${fallback_main_config_file_ref}" @@ -315,7 +315,7 @@ seed_repo=${DSL_DEFAULT_SEED_REPO} seed_ref=${DSL_DEFAULT_SEED_REF} seed_local_path=${DSL_DEFAULT_SEED_REPO_LOCAL_PATH} -fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'apache/kogito-pipelines'} +fallback_seed_repo=${DSL_DEFAULT_FALLBACK_SEED_REPO:-'apache/incubator-kie-kogito-pipelines'} fallback_seed_ref=${DSL_DEFAULT_FALLBACK_SEED_REF} if [ -z ${fallback_seed_ref} ]; then fallback_seed_ref="$(yq -e ".git.branches[] | select(.name == \"${branch_config_name}\") | .seed.branch" ${main_config_file_path} 2> /dev/null)" diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy index 86089d381..d9baac1e2 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/SeedJobUtils.groovy @@ -15,7 +15,7 @@ class SeedJobUtils { throw new RuntimeException('pathsToListen cannot be empty, else it would end up in an infinite loop ...'); } def job = jenkinsScript.pipelineJob(jobName) { - description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/apache/kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') + description('This job listens to pipelines repo and launch the seed job if needed. DO NOT USE FOR TESTING !!!! See https://github.com/apache/incubator-kie-kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs') logRotator { numToKeep(5) diff --git a/tools/update-kie7-version.sh b/tools/update-kie7-version.sh index 831030198..6e5e2ec70 100755 --- a/tools/update-kie7-version.sh +++ b/tools/update-kie7-version.sh @@ -120,7 +120,7 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/incubator-kie-kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi diff --git a/tools/update-quarkus-versions.sh b/tools/update-quarkus-versions.sh index 44880659c..19b72ee8f 100755 --- a/tools/update-quarkus-versions.sh +++ b/tools/update-quarkus-versions.sh @@ -183,6 +183,6 @@ if [ "$DRY_RUN" = "false" ]; then git push -u ${GITHUB_URL}${PR_FORK} ${PR_BRANCH} # Open a PR to kogito-runtimes using the commit as a title - # e.g. see https://github.com/apache/kogito-runtimes/pull/1200 + # e.g. see https://github.com/apache/incubator-kie-kogito-runtimes/pull/1200 gh pr create --fill --base $BRANCH -R $ORIGIN fi \ No newline at end of file From 1f5beb07bdc05898ce801c99c5e8a47374ea1303 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 10:47:11 +0200 Subject: [PATCH 07/10] updated repo names --- .ci/jenkins/Jenkinsfile.build-operator-node | 2 +- .ci/jenkins/Jenkinsfile.nightly | 2 +- .../Jenkinsfile.nightly.quarkus-platform | 8 ++++---- .ci/jenkins/config/branch.yaml | 20 +++++++++---------- .ci/jenkins/dsl/jobs.groovy | 1 - dsl/scripts/pr_check.groovy | 2 +- dsl/seed/jenkinsfiles/Jenkinsfile.buildchain | 2 +- dsl/seed/jobs/seed_job_main.groovy | 2 +- .../jenkins/jobdsl/utils/VersionUtils.groovy | 8 ++++---- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.build-operator-node b/.ci/jenkins/Jenkinsfile.build-operator-node index 4976cfde5..fba8ec3e8 100644 --- a/.ci/jenkins/Jenkinsfile.build-operator-node +++ b/.ci/jenkins/Jenkinsfile.build-operator-node @@ -20,7 +20,7 @@ pipeline { steps { script { deleteDir() - checkout(githubscm.resolveRepository('kogito-pipelines', 'apache', 'main', false)) + checkout(githubscm.resolveRepository('incubator-kogito-pipelines', 'apache', 'main', false)) } } } diff --git a/.ci/jenkins/Jenkinsfile.nightly b/.ci/jenkins/Jenkinsfile.nightly index b0f215fcf..e8880a1de 100644 --- a/.ci/jenkins/Jenkinsfile.nightly +++ b/.ci/jenkins/Jenkinsfile.nightly @@ -118,7 +118,7 @@ pipeline { // Update examples nightly branch dir('kogito-examples') { deleteDir() - checkout(githubscm.resolveRepository('kogito-examples', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) + checkout(githubscm.resolveRepository('incubator-kie-kogito-examples', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) String nightlyBranch = "nightly-${getBuildBranch()}" githubscm.createBranch(nightlyBranch) githubscm.pushObject('origin', nightlyBranch, getGitAuthorCredsID()) diff --git a/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform index 6e2ca0561..490443199 100644 --- a/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform +++ b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform @@ -42,22 +42,22 @@ pipeline { script { dir('drools') { deleteDir() - checkout(githubscm.resolveRepository('drools', getGitAuthor(), getTargetBranch(7), false)) + checkout(githubscm.resolveRepository('incubator-kie-drools', getGitAuthor(), getTargetBranch(7), false)) } dir('kogito-runtimes') { deleteDir() - checkout(githubscm.resolveRepository('kogito-runtimes', getGitAuthor(), getGitBranch(), false)) + checkout(githubscm.resolveRepository('incubator-kie-kogito-runtimes', getGitAuthor(), getGitBranch(), false)) } dir('kogito-apps') { deleteDir() - checkout(githubscm.resolveRepository('kogito-apps', getGitAuthor(), getGitBranch(), false)) + checkout(githubscm.resolveRepository('incubator-kie-kogito-apps', getGitAuthor(), getGitBranch(), false)) } dir('optaplanner') { deleteDir() // Get current corresponding branch and if not working, latest tag String opBranch = getTargetBranch(7) try { - checkout(githubscm.resolveRepository('optaplanner', getGitAuthor(), opBranch, false)) + checkout(githubscm.resolveRepository('incubator-kie-optaplanner', getGitAuthor(), opBranch, false)) } catch(err) { echo "Error checking out ${opBranch}. Fallback to latest tag." String latestTag = githubscm.getLatestTag("${opBranch.split("\\.")[0]}\\.") diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index ff5b01a11..22c57b7c0 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -40,16 +40,16 @@ environments: disable: triggers: true # TODO to set back repositories: -- name: kogito-pipelines -- name: kogito-runtimes -- name: kogito-apps -- name: kogito-examples -- name: kogito-images -- name: kogito-operator -- name: kogito-serverless-operator -- name: kogito-docs -- name: kie-tools -- name: kie-docs +- name: incubator-kie-kogito-pipelines +- name: incubator-kie-kogito-runtimes +- name: incubator-kie-kogito-apps +- name: incubator-kie-kogito-examples +- name: incubator-kie-kogito-images +- name: incubator-kie-kogito-operator +- name: incubator-kie-kogito-serverless-operator +- name: incubator-kie-kogito-docs +- name: incubator-kie-kie-tools +- name: incubator-kie-kie-docs branch: main-kogito git: author: diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index f3aa06781..5085eadd6 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -95,7 +95,6 @@ void setupUpdateJenkinsDependenciesJob() { jobParams = JobParamsUtils.getBasicJobParams(this, 'jenkins-update-framework-deps', JobType.TOOLS, "${JENKINSFILE_PATH}/Jenkinsfile.tools.update-jenkins-dependencies", 'Nightly check of Jenkins dependencies from framework against current version of Jenkins') jobParams.triggers = [cron : '@midnight'] jobParams.env.putAll([ - REPO_NAME: 'kogito-pipelines', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", BUILD_BRANCH_NAME: "${GIT_BRANCH}", diff --git a/dsl/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy index 9d0620f43..ea74d7ab9 100644 --- a/dsl/scripts/pr_check.groovy +++ b/dsl/scripts/pr_check.groovy @@ -90,7 +90,7 @@ void launchStages() { String getBuildChainCommandline() { // Those can be overriden in Jenkinsfiles String buildChainProject = env.BUILDCHAIN_PROJECT ?: CHANGE_REPO - String buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' + String buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'incubator-kie-kogito-pipelines' String buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' String buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain index 6dd2ad6d2..dc658eac9 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain @@ -22,7 +22,7 @@ settingsXmlId = env.MAVEN_SETTINGS_FILE_ID ?: defaultSettingsXmlId enableSonarCloudAnalysis = env.ENABLE_SONARCLOUD ? env.ENABLE_SONARCLOUD.toBoolean() : false downstreamBuild = env.DOWNSTREAM_BUILD ? env.DOWNSTREAM_BUILD.toBoolean() : false -buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'kogito-pipelines' +buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'incubator-kie-kogito-pipelines' buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}' buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}' buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml' diff --git a/dsl/seed/jobs/seed_job_main.groovy b/dsl/seed/jobs/seed_job_main.groovy index 4677ee7da..3d4a10b73 100644 --- a/dsl/seed/jobs/seed_job_main.groovy +++ b/dsl/seed/jobs/seed_job_main.groovy @@ -3,7 +3,7 @@ import org.kie.jenkins.jobdsl.utils.SeedJobUtils import org.kie.jenkins.jobdsl.Utils -KOGITO_PIPELINES_REPOSITORY = 'kogito-pipelines' +KOGITO_PIPELINES_REPOSITORY = 'incubator-kie-kogito-pipelines' DEFAULT_CREDENTIALS_ID = 'kie-ci' String getSeedRepo() { diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/VersionUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/VersionUtils.groovy index 7a8adeda0..ac9472b3f 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/VersionUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/VersionUtils.groovy @@ -28,15 +28,15 @@ class VersionUtils { } static boolean isKogitoProject(String project) { - return project.startsWith('kogito') + return project.startsWith('kogito') || project.startsWith('incubator-kie-kogito') } static boolean isOptaplannerProject(String project) { - return project.startsWith('opta') + return project.startsWith('opta') || project.startsWith('incubator-kie-opta') } static boolean isDroolsProject(String project) { - return project.startsWith('drools') + return project.startsWith('drools') || project.startsWith('incubator-kie-drools') } static boolean isDroolsOrOptaPlannerProject(String project) { @@ -44,7 +44,7 @@ class VersionUtils { } static boolean isOptaplannerQuickstartsProject(String project) { - return project == 'optaplanner-quickstarts' + return project == 'optaplanner-quickstarts' || project == 'incubator-kie-optaplanner-quickstarts' } } From d0515cc72ef9d3e1198d43f7896367c1b075d633 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 11:09:10 +0200 Subject: [PATCH 08/10] [Apache] Allow repository job display name --- dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch | 6 +++++- .../org/kie/jenkins/jobdsl/KogitoJobUtils.groovy | 10 +++++----- .../main/groovy/org/kie/jenkins/jobdsl/Utils.groovy | 8 ++++++++ .../org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch b/dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch index 89d34e8ab..b1e8fa295 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.seed.branch @@ -17,7 +17,7 @@ import org.kie.jenkins.jobdsl.utils.SeedJobUtils SeedJobUtils.createSeedJobTrigger( this, - "z-seed-trigger-${REPO_NAME}-job", + "z-seed-trigger-${JOB_DISPLAY_NAME}-job", "${REPO_NAME}", "${GIT_AUTHOR_NAME}", "${GIT_AUTHOR_CREDS_ID}", @@ -130,6 +130,7 @@ pipeline { // Add other repos `jenkins_config_path` var (useful if multijob PR checks for example) envProps += all_repos.collectEntries { [ + (generateEnvKey(it, 'job_display_name')): getRepoConfig(it).job_display_name, (generateEnvKey(it, 'jenkins_config_path')): getRepoConfig(it).git.jenkins_config_path, (generateEnvKey(it, 'git_branch')): getRepoConfig(it).git.branch, (generateEnvKey(it, 'git_author')): getRepoConfig(it).git.author.name, @@ -170,6 +171,7 @@ pipeline { GIT_AUTHOR_CREDS_ID: repoConfig.git.author.credentials_id, GIT_JENKINS_CONFIG_PATH: repoConfig.git.jenkins_config_path, JOB_NAME: "${JOB_NAME}", + JOB_DISPLAY_NAME: repoConfig.job_display_name, SEED_CONFIG_FILE_GIT_REPOSITORY: "${SEED_CONFIG_FILE_GIT_REPOSITORY}", SEED_CONFIG_FILE_GIT_AUTHOR_NAME: "${SEED_CONFIG_FILE_GIT_AUTHOR_NAME}", SEED_CONFIG_FILE_GIT_AUTHOR_CREDS_ID: "${SEED_CONFIG_FILE_GIT_AUTHOR_CREDS_ID}", @@ -256,6 +258,8 @@ def getRepoConfig(String repository, String generationBranch = "${GENERATION_BRA def cfg = scriptUtils.deepCopyObject(branchConfig) cfg.remove('repositories') + cfg.job_display_name = repoConfig.job_display_name + // In case repository is disabled cfg.disabled = repoConfig.disabled ?: false diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobUtils.groovy index cbfb2ce60..72ba7b3fb 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobUtils.groovy @@ -42,7 +42,7 @@ class KogitoJobUtils { * */ static def createVersionUpdateToolsJob(def script, String repository, String dependencyName, def mavenUpdate = [:], def gradleUpdate = [:], def filepathReplaceRegex = [], def scriptCalls = []) { - def jobParams = JobParamsUtils.getSeedJobParams(script, "update-${dependencyName.toLowerCase()}-${repository}", JobType.TOOLS, 'Jenkinsfile.update-dependency-version', "Update ${dependencyName} version for ${repository}") + def jobParams = JobParamsUtils.getSeedJobParams(script, "update-${dependencyName.toLowerCase()}-${Utils.getRepositoryJobDisplayName(script, repository)}", JobType.TOOLS, 'Jenkinsfile.update-dependency-version', "Update ${dependencyName} version for ${repository}") JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(script, jobParams) // Setup correct checkout branch for pipelines jobParams.env.putAll([ @@ -178,7 +178,7 @@ class KogitoJobUtils { * */ static def createEnvironmentIntegrationBranchNightlyJob(def script, String envName, def scriptCalls = [], Closure defaultJobParamsGetter = JobParamsUtils.DEFAULT_PARAMS_GETTER) { - def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${Utils.getRepoName(script)}.integration", JobType.NIGHTLY, envName, 'Jenkinsfile.environment.integration-branch', "Generic Integration branch job for specific environment", defaultJobParamsGetter) + def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${Utils.getJobDisplayName(script)}.integration", JobType.NIGHTLY, envName, 'Jenkinsfile.environment.integration-branch', "Generic Integration branch job for specific environment", defaultJobParamsGetter) jobParams.triggers = jobParams.triggers ?: [ cron : '@midnight' ] // To remove once environment nightlies are managed by main nightly pipeline if (!envName) { throw new RuntimeException('Please provide a non-empty environment to generate an integration branch job...') @@ -237,7 +237,7 @@ class KogitoJobUtils { * See also `createBranchBuildChainJob` method */ static def createNightlyBuildChainBuildAndTestJob(def script, String envName = '', String repository, Map extraEnv = [:], boolean enableNotification = false, Closure defaultJobParamsGetter = JobParamsUtils.DEFAULT_PARAMS_GETTER) { - def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${repository}.build-and-test", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Build & Test for ${repository} using the build-chain", defaultJobParamsGetter) + def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${Utils.getRepositoryJobDisplayName(script, repository)}.build-and-test", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Build & Test for ${repository} using the build-chain", defaultJobParamsGetter) jobParams.env.putAll(extraEnv) jobParams.triggers = jobParams.triggers ?: [ cron : '@midnight' ] // To remove once environment nightlies are managed by main nightly pipeline return createBranchBuildChainJob(script, jobParams, repository, enableNotification, envName) @@ -258,7 +258,7 @@ class KogitoJobUtils { * See also `createBranchBuildChainJob` method */ static def createNightlyBuildChainBuildAndDeployJob(def script, String envName = '', String repository, Map extraEnv = [:], boolean enableNotification = false, Closure defaultJobParamsGetter = JobParamsUtils.DEFAULT_PARAMS_GETTER) { - def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${repository}.build-and-deploy", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Build & Test for ${repository} using the build-chain", defaultJobParamsGetter) + def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${Utils.getRepositoryJobDisplayName(script, repository)}.build-and-deploy", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Build & Test for ${repository} using the build-chain", defaultJobParamsGetter) JobParamsUtils.setupJobParamsDeployConfiguration(script, jobParams) jobParams.env.putAll(extraEnv) return createBranchBuildChainJob(script, jobParams, repository, enableNotification, envName) @@ -285,7 +285,7 @@ class KogitoJobUtils { * */ static def createBuildChainIntegrationJob(def script, String envName, String repository, boolean enableNotification = false, Closure defaultJobParamsGetter = JobParamsUtils.DEFAULT_PARAMS_GETTER) { - def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${repository}.integration", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Integration with Quarkus for ${repository} using the build-chain", defaultJobParamsGetter) + def jobParams = JobParamsUtils.getSeedJobParamsWithEnv(script, "${Utils.getRepositoryJobDisplayName(script, repository)}.integration", JobType.NIGHTLY, envName, KogitoConstants.BUILD_CHAIN_JENKINSFILE, "Integration with Quarkus for ${repository} using the build-chain", defaultJobParamsGetter) if (!envName) { throw new RuntimeException('Please provide a non-empty environment to generate an integration branch job...') } diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy index ae50474da..8eb1435d2 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/Utils.groovy @@ -63,6 +63,14 @@ class Utils { return getBindingValue(script, 'REPO_NAME') } + static String getRepositoryJobDisplayName(def script, String repository) { + return getBindingValue(script, "${repository.toUpperCase()}_JOB_DISPLAY_NAME") ?: repository + } + + static String getJobDisplayName(def script) { + return getRepositoryJobDisplayName(script, getRepoName(script)) + } + static String getGitBranch(def script) { return getBindingValue(script, 'GIT_BRANCH') } diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy index 7e6770b3b..5efe44b61 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/utils/JobParamsUtils.groovy @@ -16,7 +16,7 @@ class JobParamsUtils { repository = repository ?: Utils.getRepoName(script) def jobParams = [ job: [ - name: repository, + name: Utils.getRepositoryJobDisplayName(script, repository), ], git: [ author: Utils.getGitAuthor(script), From 2569f2b83afab64a0dd15c0b0a0a980026882cc2 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 11:16:31 +0200 Subject: [PATCH 09/10] updated config with job_display_name --- .ci/jenkins/config/branch.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 22c57b7c0..4435ecb7d 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -41,15 +41,25 @@ disable: triggers: true # TODO to set back repositories: - name: incubator-kie-kogito-pipelines + job_display_name: kogito-pipelines - name: incubator-kie-kogito-runtimes + job_display_name: kogito-runtimes - name: incubator-kie-kogito-apps + job_display_name: kogito-apps - name: incubator-kie-kogito-examples + job_display_name: kogito-examples - name: incubator-kie-kogito-images + job_display_name: kogito-images - name: incubator-kie-kogito-operator + job_display_name: kogito-operator - name: incubator-kie-kogito-serverless-operator + job_display_name: kogito-serverless-operator - name: incubator-kie-kogito-docs + job_display_name: kogito-docs - name: incubator-kie-kie-tools + job_display_name: kie-tools - name: incubator-kie-kie-docs + job_display_name: kie-docs branch: main-kogito git: author: From 721a3cdb38a7a5c554add595c20697a979f2561a Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 14:55:58 +0200 Subject: [PATCH 10/10] various updates --- .../Jenkinsfile.nightly.quarkus-platform | 2 +- .ci/jenkins/Jenkinsfile.setup-branch | 2 +- .ci/jenkins/config/branch.yaml | 2 +- .ci/jenkins/config/main.yaml | 5 +++- .ci/jenkins/dsl/jobs.groovy | 26 ++++++++++--------- .ci/project-dependencies.yaml | 10 +++---- .ci/pull-request-config.yaml | 14 +++++----- .github/workflows/jenkins-dsl-downstream.yml | 2 +- .../jenkins/jobdsl/KogitoJobTemplate.groovy | 2 +- 9 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform index 490443199..6797aedd6 100644 --- a/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform +++ b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform @@ -62,7 +62,7 @@ pipeline { echo "Error checking out ${opBranch}. Fallback to latest tag." String latestTag = githubscm.getLatestTag("${opBranch.split("\\.")[0]}\\.") echo "Got latest tag = ${latestTag}" - checkout(githubscm.resolveRepository('optaplanner', getGitAuthor(), latestTag, false)) + checkout(githubscm.resolveRepository('incubator-kie-optaplanner', getGitAuthor(), latestTag, false)) } } } diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 61506677d..79a59f027 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -75,7 +75,7 @@ pipeline { // Update examples nightly branch dir('kogito-examples') { deleteDir() - checkout(githubscm.resolveRepository('kogito-examples', getGitAuthor(), getBuildBranch(), false)) + checkout(githubscm.resolveRepository('incubator-kie-kogito-examples', getGitAuthor(), getBuildBranch(), false)) String nightlyBranch = "nightly-${getBuildBranch()}" githubscm.createBranch(nightlyBranch) githubscm.pushObject('origin', nightlyBranch, getGitAuthorCredsID()) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 4435ecb7d..fe55b1907 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -79,7 +79,7 @@ git: jenkins_config_path: .ci/jenkins buildchain_config: git: - repository: kogito-pipelines + repository: incubator-kie-kogito-pipelines file_path: .ci/pull-request-config.yaml maven: settings_file_id: kie-release-settings diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml index 7b45e407d..2f760d1aa 100644 --- a/.ci/jenkins/config/main.yaml +++ b/.ci/jenkins/config/main.yaml @@ -7,14 +7,17 @@ ecosystem: default_main_version: 2.0.0-SNAPSHOT regexs: - kogito.* + - incubator-kie-kogito.* - name: kie-tools ignore_release: true regexs: - kie-tools.* + - incubator-kie-kie-tools.* - name: kie-docs ignore_release: true regexs: - kie-docs.* + - incubator-kie-kie-docs.* git: branches: - name: main @@ -22,7 +25,7 @@ git: seed: config_file: git: - repository: kogito-pipelines + repository: incubator-kie-kogito-pipelines author: name: apache credentials_id: kie-ci3 diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 5085eadd6..fd5612796 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -192,27 +192,29 @@ void setupQuarkus3NightlyJob() { // Tests are done on 9.x/2.x branch => Create 2.x branch on Kogito // Need to split as Drools and Kogito end up in different integration branches KogitoJobUtils.createNightlyBuildChainIntegrationJob(this, 'quarkus-3', 'drools', true) { script -> - def jobParams = JobParamsUtils.getDefaultJobParams(script, 'drools') + def jobParams = JobParamsUtils.getDefaultJobParams(script, 'incubator-kie-drools') jobParams.git.branch = VersionUtils.getProjectTargetBranch('drools', Utils.getGitBranch(this), Utils.getRepoName(this)) jobParams.env.put('ADDITIONAL_TIMEOUT', '180') jobParams.env.put('BUILD_ENVIRONMENT_OPTIONS_CURRENT', 'rewrite push_changes') jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '9.x') - jobParams.env.put('LAUNCH_DOWNSTREAM_JOBS', 'kie-jpmml-integration.integration,kogito-runtimes.integration') - jobParams.parametersValues.put('SKIP_TESTS', true) - jobParams.parametersValues.put('SKIP_INTEGRATION_TESTS', true) - return jobParams - } - KogitoJobUtils.createBuildChainIntegrationJob(this, 'quarkus-3', 'kie-jpmml-integration', true) { script -> - def jobParams = JobParamsUtils.getDefaultJobParams(script, 'kie-jpmml-integration') - jobParams.env.put('ADDITIONAL_TIMEOUT', '180') - jobParams.env.put('BUILD_ENVIRONMENT_OPTIONS_CURRENT', 'rewrite push_changes') - jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '9.x') + // jobParams.env.put('LAUNCH_DOWNSTREAM_JOBS', 'kie-jpmml-integration.integration,kogito-runtimes.integration') + jobParams.env.put('LAUNCH_DOWNSTREAM_JOBS', 'kogito-runtimes.integration') jobParams.parametersValues.put('SKIP_TESTS', true) jobParams.parametersValues.put('SKIP_INTEGRATION_TESTS', true) return jobParams } + // Commented as not migrated to Apache + // KogitoJobUtils.createBuildChainIntegrationJob(this, 'quarkus-3', 'kie-jpmml-integration', true) { script -> + // def jobParams = JobParamsUtils.getDefaultJobParams(script, 'incubator-kie-kie-jpmml-integration') + // jobParams.env.put('ADDITIONAL_TIMEOUT', '180') + // jobParams.env.put('BUILD_ENVIRONMENT_OPTIONS_CURRENT', 'rewrite push_changes') + // jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '9.x') + // jobParams.parametersValues.put('SKIP_TESTS', true) + // jobParams.parametersValues.put('SKIP_INTEGRATION_TESTS', true) + // return jobParams + // } KogitoJobUtils.createBuildChainIntegrationJob(this, 'quarkus-3', 'kogito-runtimes', true) { script -> - def jobParams = JobParamsUtils.getDefaultJobParams(script, 'kogito-runtimes') + def jobParams = JobParamsUtils.getDefaultJobParams(script, 'incubator-kie-kogito-runtimes') jobParams.env.put('ADDITIONAL_TIMEOUT', '720') jobParams.env.put('BUILD_ENVIRONMENT_OPTIONS_CURRENT', 'rewrite push_changes') jobParams.env.put('INTEGRATION_BRANCH_CURRENT', '2.x') diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml index 3734970da..7599df54b 100644 --- a/.ci/project-dependencies.yaml +++ b/.ci/project-dependencies.yaml @@ -10,8 +10,8 @@ dependencies: default: - source: (\d*)\.(.*) targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" - exclude: - - kiegroup/kie-jpmml-integration + # exclude: + # - kiegroup/kie-jpmml-integration - project: apache/incubator-kie-kogito-runtimes dependencies: @@ -61,7 +61,7 @@ dependencies: exclude: - apache/incubator-kie-kogito-apps - apache/incubator-kie-kogito-runtimes - - project: kiegroup/kie-jpmml-integration - dependencies: - - project: apache/incubator-kie-drools + # - project: kiegroup/kie-jpmml-integration + # dependencies: + # - project: apache/incubator-kie-drools # no mapping needed diff --git a/.ci/pull-request-config.yaml b/.ci/pull-request-config.yaml index 4a014882b..f63835e8f 100644 --- a/.ci/pull-request-config.yaml +++ b/.ci/pull-request-config.yaml @@ -65,10 +65,10 @@ build: upstream: | mvn dependency:tree clean install -DskipTests -DskipITs ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_EXAMPLES_BUILD_MVN_OPTS_UPSTREAM }} - - project: kiegroup/kie-jpmml-integration - build-command: - current: | - export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` - mvn clean ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS }} - upstream: | - mvn clean install -DskipTests ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS_UPSTREAM }} + # - project: kiegroup/kie-jpmml-integration + # build-command: + # current: | + # export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` + # mvn clean ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS }} + # upstream: | + # mvn clean install -DskipTests ${ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS_UPSTREAM }} diff --git a/.github/workflows/jenkins-dsl-downstream.yml b/.github/workflows/jenkins-dsl-downstream.yml index 2cc1e9165..509c834dd 100644 --- a/.github/workflows/jenkins-dsl-downstream.yml +++ b/.github/workflows/jenkins-dsl-downstream.yml @@ -311,7 +311,7 @@ jobs: echo 'BASE_BRANCH=${{ github.base_ref }}' >> $GITHUB_ENV - name: Setup correct base branch for optaplanner-quickstarts - if: github.base_ref == 'main' && matrix.repository == 'optaplanner-quickstarts' + if: github.base_ref == 'main' && matrix.repository == 'incubator-kie-optaplanner-quickstarts' run: | echo 'BASE_BRANCH=development' >> $GITHUB_ENV diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy index 19ea788dd..ccced3e71 100644 --- a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy +++ b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy @@ -182,7 +182,7 @@ class KogitoJobTemplate { jobParams.pr = jobParams.pr ?: [:] jobParams.pr.putAll ([ run_only_for_labels: (jobParams.pr.run_only_for_labels ?: []) + [KogitoConstants.LABEL_DSL_TEST], - run_only_for_branches: [ jobParams.git.repository == 'optaplanner-quickstarts' ? 'development' : 'main' ], + run_only_for_branches: [ VersionUtils.isOptaplannerQuickstartsProject(jobParams.git.repository) ? 'development' : 'main' ], authorized_users: [ 'apache' ], authorized_groups: [ 'apache' ], ])