This is an automated email from the ASF dual-hosted git repository.
tzimanyi pushed a commit to branch apache_migration
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-pipelines.git
The following commit(s) were added to refs/heads/apache_migration by this push:
new 9cf12a00 Update `kiegroup` repository references to `apache` (#1078)
9cf12a00 is described below
commit 9cf12a00cc400df0d57bf07e8d5ae920014d53e3
Author: Tristan Radisson <[email protected]>
AuthorDate: Mon Sep 18 09:14:49 2023 +0200
Update `kiegroup` repository references to `apache` (#1078)
---
.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.build-operator-node | 2 +-
.ci/jenkins/Jenkinsfile.nightly | 2 +-
.ci/jenkins/Jenkinsfile.nightly.cloud | 4 +--
.ci/jenkins/Jenkinsfile.nightly.quarkus-platform | 10 +++---
.ci/jenkins/Jenkinsfile.release | 4 +--
.ci/jenkins/Jenkinsfile.release.cloud | 4 +--
.ci/jenkins/Jenkinsfile.setup-branch | 2 +-
.ci/jenkins/config/branch.yaml | 42 ++++++++++++++--------
.ci/jenkins/config/main.yaml | 11 +++---
.ci/jenkins/dsl/jobs.groovy | 8 ++---
.ci/project-dependencies.yaml | 32 ++++++++---------
.ci/pull-request-config.yaml | 10 +++---
.github/workflows/generate_status_page.yaml | 4 +--
.github/workflows/generate_status_page_data.yaml | 4 +--
.github/workflows/jenkins-dsl-downstream.yml | 20 +++++------
.github/workflows/jenkins-tests.yml | 4 +--
README.md | 14 ++++----
docs/jenkins.md | 8 ++---
docs/nightly pipeline.md | 24 ++++++-------
docs/release pipeline.md | 28 +++++++--------
dsl/scripts/pr_check.groovy | 4 +--
dsl/seed/jenkinsfiles/Jenkinsfile.buildchain | 8 ++---
dsl/seed/jobs/seed_job_branch.groovy | 2 +-
dsl/seed/jobs/seed_job_main.groovy | 8 ++---
dsl/seed/scripts/seed_test.sh | 12 +++----
.../kie/jenkins/jobdsl/KogitoJobTemplate.groovy | 8 ++---
.../groovy/org/kie/jenkins/jobdsl/Utils.groovy | 6 ++--
.../kie/jenkins/jobdsl/utils/JobParamsUtils.groovy | 2 +-
.../kie/jenkins/jobdsl/utils/SeedJobUtils.groovy | 2 +-
.../kie/jenkins/jobdsl/utils/VersionUtils.groovy | 8 ++---
tools/update-kie7-version.sh | 4 +--
tools/update-quarkus-versions.sh | 4 +--
36 files changed, 162 insertions(+), 151 deletions(-)
diff --git a/.ci/actions/build-chain/action.yml
b/.ci/actions/build-chain/action.yml
index bd171e79..83a78dab 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}/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 0f4a330a..c693a8eb 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/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 c9d1d8a2..af8004d7 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/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 33cedd82..fe3a3be3 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/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 [...]
diff --git a/.ci/jenkins/Jenkinsfile.build-operator-node
b/.ci/jenkins/Jenkinsfile.build-operator-node
index 7ab4d028..fba8ec3e 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('incubator-kogito-pipelines', 'apache',
'main', false))
}
}
}
diff --git a/.ci/jenkins/Jenkinsfile.nightly b/.ci/jenkins/Jenkinsfile.nightly
index b0f215fc..e8880a1d 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.cloud
b/.ci/jenkins/Jenkinsfile.nightly.cloud
index f3f5d0b8..fc6e572e 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.nightly.quarkus-platform
b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform
index 6e2ca056..6797aedd 100644
--- a/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform
+++ b/.ci/jenkins/Jenkinsfile.nightly.quarkus-platform
@@ -42,27 +42,27 @@ 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]}\\.")
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.release b/.ci/jenkins/Jenkinsfile.release
index 087a1de6..2eccc43d 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/Jenkinsfile.release.cloud
b/.ci/jenkins/Jenkinsfile.release.cloud
index c9cd756e..7019f149 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/jenkins/Jenkinsfile.setup-branch
b/.ci/jenkins/Jenkinsfile.setup-branch
index 61506677..79a59f02 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 d2d2c066..9c6311db 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -40,22 +40,34 @@ 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 // Commented as this one will be treated at another time
-- name: kie-docs
- # branch: main-kogito # TODO kie-docs PR should be against `main-kogito`
+- 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 // Commented as this one will be treated at
another time
+# job_display_name: kie-tools
+- name: incubator-kie-kie-docs
+ job_display_name: kie-docs
+ branch: main-kogito
git:
author:
- name: kiegroup
- credentials_id: kie-ci3
- token_credentials_id: kie-ci3-token
+ name: apache
+ # 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
@@ -67,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 b809d94e..9fc09cc4 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -7,26 +7,29 @@ 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: apache_migration
+ - name: main
main_branch: true
seed:
config_file:
git:
- repository: kogito-pipelines
+ repository: incubator-kie-kogito-pipelines
author:
- name: kiegroup
+ 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:
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 0835db13..fd561279 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}",
@@ -193,7 +192,7 @@ 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')
@@ -204,8 +203,9 @@ void setupQuarkus3NightlyJob() {
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,
'kie-jpmml-integration')
+ // 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')
@@ -214,7 +214,7 @@ void setupQuarkus3NightlyJob() {
// 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 51dfbb92..7599df54 100644
--- a/.ci/project-dependencies.yaml
+++ b/.ci/project-dependencies.yaml
@@ -1,6 +1,6 @@
version: "2.1"
dependencies:
- - project: kiegroup/drools
+ - project: apache/incubator-kie-drools
mapping:
dependencies:
default:
@@ -13,9 +13,9 @@ dependencies:
# exclude:
# - kiegroup/kie-jpmml-integration
- - project: kiegroup/kogito-runtimes
+ - project: apache/incubator-kie-kogito-runtimes
dependencies:
- - project: kiegroup/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:
- - kiegroup/kogito-examples
- - kiegroup/kogito-apps
+ - apache/incubator-kie-kogito-examples
+ - apache/incubator-kie-kogito-apps
- - project: kiegroup/kogito-apps
+ - project: apache/incubator-kie-kogito-apps
dependencies:
- - project: kiegroup/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:
- - kiegroup/kogito-examples
- - kiegroup/kogito-runtimes
+ - apache/incubator-kie-kogito-examples
+ - apache/incubator-kie-kogito-runtimes
- - project: kiegroup/kogito-examples
+ - project: apache/incubator-kie-kogito-examples
dependencies:
- - project: kiegroup/kogito-runtimes
- - project: kiegroup/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:
- - kiegroup/kogito-apps
- - kiegroup/kogito-runtimes
+ - apache/incubator-kie-kogito-apps
+ - apache/incubator-kie-kogito-runtimes
# - project: kiegroup/kie-jpmml-integration
# dependencies:
- # - project: kiegroup/drools
- # # no mapping needed
+ # - project: apache/incubator-kie-drools
+ # no mapping needed
diff --git a/.ci/pull-request-config.yaml b/.ci/pull-request-config.yaml
index d2cea666..f63835e8 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/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: kiegroup/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: kiegroup/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: kiegroup/kogito-examples
+ - project: apache/incubator-kie-kogito-examples
build-command:
# First install the main pom
# Then build the required submodule pom
@@ -71,4 +71,4 @@ build:
# 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 }}
+ # 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/generate_status_page.yaml
b/.github/workflows/generate_status_page.yaml
index f6cef9f1..00839282 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/incubator-kie-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 c313cad6..293f7deb 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 30e2618b..509c834d 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/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: kiegroup/kogito-pipelines
+ main-config-file-repo: apache/incubator-kie-kogito-pipelines
main-config-file-path: .ci/jenkins/config/main.yaml
- branch-config-file-repo: kiegroup/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: kiegroup/optaplanner
+ repository: apache/incubator-kie-optaplanner
ref: main
path: main_config_repo
@@ -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
@@ -320,9 +320,9 @@ jobs:
with:
project: optaplanner
repository: ${{ matrix.repository }}
- main-config-file-repo: kiegroup/optaplanner
+ main-config-file-repo: apache/incubator-kie-optaplanner
main-config-file-path: .ci/jenkins/config/main.yaml
- branch-config-file-repo: kiegroup/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: kiegroup/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: kiegroup/drools
+ main-config-file-repo: apache/incubator-kie-drools
main-config-file-path: .ci/jenkins/config/main.yaml
- branch-config-file-repo: kiegroup/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 e774d695..7624e439 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: kiegroup/kogito-pipelines
+ main-config-file-repo: apache/incubator-kie-kogito-pipelines
main-config-file-path: .ci/jenkins/config/main.yaml
- branch-config-file-repo: kiegroup/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 a917bff3..dc071e71 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/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/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/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 4d303325..89767f6f 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/kiegroup/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 `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/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 1337390f..487f5462 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/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 a4174a0c..8f1a1d79 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/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/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/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/kiegroup/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/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy
index 5a043700..ea74d7ab 100644
--- a/dsl/scripts/pr_check.groovy
+++ b/dsl/scripts/pr_check.groovy
@@ -90,9 +90,9 @@ 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: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 034af638..dc658eac 100644
--- a/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain
+++ b/dsl/seed/jenkinsfiles/Jenkinsfile.buildchain
@@ -22,9 +22,9 @@ 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: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 976e6c93..fd30e850 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/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 4265c439..3d4a10b7 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() {
@@ -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/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 e0e36809..d5d01343 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/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 `kiegroup/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 `kiegroup/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:-'kiegroup/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:-'kiegroup/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:-'kiegroup/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/KogitoJobTemplate.groovy
b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy
index 9e8751df..019c8c2f 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,14 +182,14 @@ 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' ],
- authorized_users: [ 'kiegroup' ],
- authorized_groups: [ 'kiegroup' ],
+ run_only_for_branches: [
VersionUtils.isOptaplannerQuickstartsProject(jobParams.git.repository) ?
'development' : 'main' ],
+ 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 91b30f04..992ecfa5 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
@@ -106,9 +106,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 3aa6466f..5efe44b6 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 2f53892a..d9baac1e 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/incubator-kie-kogito-pipelines/blob/main/docs/jenkins.md#test-specific-jobs')
logRotator {
numToKeep(5)
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 7a8adeda..ac9472b3 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'
}
}
diff --git a/tools/update-kie7-version.sh b/tools/update-kie7-version.sh
index a1582c1c..6e5e2ec7 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/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 ad4cf80a..19b72ee8 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/incubator-kie-kogito-runtimes/pull/1200
gh pr create --fill --base $BRANCH -R $ORIGIN
fi
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
