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-optaplanner-quickstarts.git
The following commit(s) were added to refs/heads/apache_migration by this push:
new 3a3193e1 Change kiegroup references to apache. (#606)
3a3193e1 is described below
commit 3a3193e14299d249eb0313a76ab94acf65585767
Author: Tibor Zimányi <[email protected]>
AuthorDate: Mon Sep 18 13:27:00 2023 +0200
Change kiegroup references to apache. (#606)
* Update kiegroup repository references to apache
* Fix CI
* update references
* updated repo names
* various updates
* Adapt kiegroup to apache2 (#605)
PR multibranchPipelineJob (#602)
* PR multibranchPipelineJob
* set Jenkinsfile timeout time as int
---------
Co-authored-by: jstastny-cz <[email protected]>
---------
Co-authored-by: radtriste <[email protected]>
Co-authored-by: Jan Stastny <[email protected]>
Co-authored-by: jstastny-cz <[email protected]>
---
.ci/environments/common/update_quarkus.sh | 2 +-
.ci/jenkins/Jenkinsfile | 8 ++++----
.ci/jenkins/Jenkinsfile.setup-branch | 2 +-
.ci/jenkins/dsl/jobs.groovy | 5 ++---
.ci/jenkins/dsl/test.sh | 8 ++++----
.github/pull_request_template.md | 6 +++---
.github/workflows/full-downstream.yml | 2 +-
.github/workflows/jenkins-tests-PR.yml | 4 ++--
.github/workflows/nightly.yml | 2 +-
.github/workflows/pull_request.yml | 2 +-
10 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.ci/environments/common/update_quarkus.sh
b/.ci/environments/common/update_quarkus.sh
index 6ac5e81e..2c2e7064 100755
--- a/.ci/environments/common/update_quarkus.sh
+++ b/.ci/environments/common/update_quarkus.sh
@@ -3,7 +3,7 @@ set -euo pipefail
mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"
-source <(curl -s
https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)
+source <(curl -s
https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)
echo "Update project with Quarkus version ${QUARKUS_VERSION}"
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d2722492..61d72e4f 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -8,11 +8,11 @@ pipeline {
}
options {
timestamps()
- timeout(time: 720, unit: 'MINUTES')
+ timeout(time: 360, unit: 'MINUTES')
}
environment {
- BUILDCHAIN_PROJECT = 'kiegroup/optaplanner-quickstarts'
- BUILDCHAIN_CONFIG_REPO = 'optaplanner'
+ BUILDCHAIN_PROJECT = 'apache/incubator-kie-optaplanner-quickstarts'
+ BUILDCHAIN_CONFIG_REPO = 'incubator-kie-optaplanner'
BUILDCHAIN_CONFIG_FILE_PATH = '.ci/buildchain-config.yaml'
OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM = '-Dfull'
@@ -24,7 +24,7 @@ pipeline {
script {
// load `pr_check.groovy` file from kogito-pipelines:main
dir('kogito-pipelines') {
-
checkout(githubscm.resolveRepository('kogito-pipelines', 'kiegroup',
'apache_migration', false, 'kie-ci')) // TODO to change back to kiegroup:main
+
checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines',
'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
pr_check_script = load 'dsl/scripts/pr_check.groovy'
}
}
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch
b/.ci/jenkins/Jenkinsfile.setup-branch
index bf839387..d7320ce4 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -3,7 +3,7 @@ import org.jenkinsci.plugins.workflow.libs.Library
import org.kie.jenkins.MavenCommand
-optaplannerRepo = 'optaplanner'
+optaplannerRepo = 'incubator-kie-optaplanner'
pipeline {
agent {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 591842bc..48d902e2 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -2,10 +2,10 @@
* This file is describing all the Jenkins jobs in the DSL format (see
https://plugins.jenkins.io/job-dsl/)
* needed by the Kogito pipelines.
*
-* The main part of Jenkins job generation is defined into the
https://github.com/kiegroup/kogito-pipelines repository.
+* The main part of Jenkins job generation is defined into the
https://github.com/apache/incubator-kie-kogito-pipelines repository.
*
* This file is making use of shared libraries defined in
-*
https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
+*
https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
*/
import org.kie.jenkins.jobdsl.model.JobType
@@ -64,7 +64,6 @@ void createSetupBranchJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner-quickstarts', JobType.SETUP_BRANCH,
"${jenkins_path}/Jenkinsfile.setup-branch", 'OptaPlanner Quickstarts Setup
Branch')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
- REPO_NAME: 'optaplanner-quickstarts',
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index 1dd3b10f..5449b263 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -22,13 +22,13 @@ fi
git_author="$(echo ${git_url} | awk -F"${git_server_url}" '{print $2}' | awk
-F. '{print $1}' | awk -F/ '{print $1}')"
-export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO="${git_author}"/optaplanner
-export DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO=kiegroup/optaplanner
+export
DSL_DEFAULT_MAIN_CONFIG_FILE_REPO="${git_author}"/incubator-kie-optaplanner
+export
DSL_DEFAULT_FALLBACK_MAIN_CONFIG_FILE_REPO=apache/incubator-kie-optaplanner
export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=.ci/jenkins/config/main.yaml
-export DSL_DEFAULT_BRANCH_CONFIG_FILE_REPO="${git_author}"/optaplanner
+export
DSL_DEFAULT_BRANCH_CONFIG_FILE_REPO="${git_author}"/incubator-kie-optaplanner
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} $@
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b4097a1c..fb0fe2b0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,11 +19,11 @@ and also the external
https://github.com/quarkusio/quarkus-quickstarts/tree/main
### Referenced pull requests
<!-- Add URLs of all referenced pull requests if they exist. This is only
required when making
-changes that span multiple kiegroup repositories and depend on each other. -->
+changes that span multiple apache repositories and depend on each other. -->
<!-- Example:
- https://github.com/kiegroup/droolsjbpm-build-bootstrap/pull/1234
-- https://github.com/kiegroup/drools/pull/3000
-- https://github.com/kiegroup/optaplanner/pull/899
+- https://github.com/apache/incubator-kie-drools/pull/3000
+- https://github.com/apache/incubator-kie-optaplanner/pull/899
- etc.
-->
diff --git a/.github/workflows/full-downstream.yml
b/.github/workflows/full-downstream.yml
index dffec7ce..a628427e 100644
--- a/.github/workflows/full-downstream.yml
+++ b/.github/workflows/full-downstream.yml
@@ -54,7 +54,7 @@ jobs:
id: build-chain
uses: kiegroup/[email protected]
with:
- definition-file:
https://raw.githubusercontent.com/${GROUP}/optaplanner/main/.ci/buildchain-config.yaml
+ definition-file:
https://raw.githubusercontent.com/${GROUP}/incubator-kie-optaplanner/main/.ci/buildchain-config.yaml
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM: "-Dfull"
diff --git a/.github/workflows/jenkins-tests-PR.yml
b/.github/workflows/jenkins-tests-PR.yml
index bfb08b1b..12687304 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -25,7 +25,7 @@ jobs:
uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
with:
project: optaplanner
- 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 }}
\ No newline at end of file
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b79e74eb..5206ce25 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -8,7 +8,7 @@ on:
jobs:
nightly:
- if: github.repository == 'kiegroup/optaplanner-quickstarts'
+ if: github.repository == 'apache/incubator-kie-optaplanner-quickstarts'
concurrency:
group: nightly
cancel-in-progress: true
diff --git a/.github/workflows/pull_request.yml
b/.github/workflows/pull_request.yml
index 8b0a17fd..f5ee0ec2 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -46,7 +46,7 @@ jobs:
- name: Build Chain
uses: kiegroup/kie-ci/.ci/actions/build-chain@main
with:
- definition-file:
https://raw.githubusercontent.com/${GROUP:kiegroup}/optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml
+ definition-file:
https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml
annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{
matrix.maven-version }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Surefire Report
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
