Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kiegroup repository references to apache #1078

Merged
merged 15 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/actions/build-chain/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .ci/actions/dsl-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .ci/actions/os-preparation/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/chain-status-info.md
Original file line number Diff line number Diff line change
@@ -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 tool, so we can customize the job execution frequency as we need.
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.build-operator-node
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.nightly.cloud
Original file line number Diff line number Diff line change
Expand Up @@ -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()}")
}

Expand Down
10 changes: 5 additions & 5 deletions .ci/jenkins/Jenkinsfile.nightly.quarkus-platform
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.release.cloud
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.setup-branch
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
42 changes: 27 additions & 15 deletions .ci/jenkins/config/branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 7 additions & 4 deletions .ci/jenkins/config/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .ci/jenkins/dsl/jobs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down Expand Up @@ -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')
Expand All @@ -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')
Expand All @@ -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')
Expand Down
32 changes: 16 additions & 16 deletions .ci/project-dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2.1"
dependencies:
- project: kiegroup/drools
- project: apache/incubator-kie-drools
mapping:
dependencies:
default:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
10 changes: 5 additions & 5 deletions .ci/pull-request-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ 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"`
mvn dependency:tree clean ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.DROOLS_BUILD_MVN_OPTS }}
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"`
mvn dependency:tree clean -Dfull ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS }}
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"`
Expand All @@ -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
Expand All @@ -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 }}
Loading
Loading