From a5c5254b232cd6e8a570646ba7c76bdac13f21df Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 16:19:00 +0200 Subject: [PATCH 1/6] Update kiegroup repository references to apache --- .ci/environments/common/update_quarkus.sh | 2 +- .ci/jenkins/Jenkinsfile | 4 ++-- .ci/jenkins/dsl/jobs.groovy | 4 ++-- .ci/jenkins/dsl/test.sh | 4 ++-- .github/pull_request_template.md | 6 +++--- .github/workflows/jenkins-tests-PR.yml | 4 ++-- .github/workflows/nightly.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.ci/environments/common/update_quarkus.sh b/.ci/environments/common/update_quarkus.sh index 6ac5e81e5..c08110472 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/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 d2722492f..74401f5d0 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { timeout(time: 720, unit: 'MINUTES') } environment { - BUILDCHAIN_PROJECT = 'kiegroup/optaplanner-quickstarts' + BUILDCHAIN_PROJECT = 'apache/optaplanner-quickstarts' BUILDCHAIN_CONFIG_REPO = 'optaplanner' BUILDCHAIN_CONFIG_FILE_PATH = '.ci/buildchain-config.yaml' @@ -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('kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds')) pr_check_script = load 'dsl/scripts/pr_check.groovy' } } diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 591842bc5..3354dd2bc 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/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/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl. */ import org.kie.jenkins.jobdsl.model.JobType diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh index 1dd3b10fe..05cc5e160 100755 --- a/.ci/jenkins/dsl/test.sh +++ b/.ci/jenkins/dsl/test.sh @@ -23,12 +23,12 @@ 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_FALLBACK_MAIN_CONFIG_FILE_REPO=apache/optaplanner export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=.ci/jenkins/config/main.yaml export DSL_DEFAULT_BRANCH_CONFIG_FILE_REPO="${git_author}"/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/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 b4097a1c5..215998fbf 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 +changes that span multiple apache repositories and depend on each other. --> diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index bfb08b1bb..cd504193a 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/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 }} \ No newline at end of file diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b79e74eb3..f2cd82366 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/optaplanner-quickstarts' concurrency: group: nightly cancel-in-progress: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8b0a17fd4..e86921740 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}/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 From 45b49bf49334a0a97283f6538e66680950921e2c Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 11 Sep 2023 10:32:06 +0200 Subject: [PATCH 2/6] Fix CI --- .ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile index 74401f5d0..ecbe194db 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } options { timestamps() - timeout(time: 720, unit: 'MINUTES') + timeout(time: 360, unit: 'MINUTES') } environment { BUILDCHAIN_PROJECT = 'apache/optaplanner-quickstarts' From 23e63602c24471f87197be95f2fc73394ecaceed Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 11 Sep 2023 14:00:03 +0200 Subject: [PATCH 3/6] update references --- .ci/environments/common/update_quarkus.sh | 2 +- .ci/jenkins/Jenkinsfile | 2 +- .ci/jenkins/dsl/jobs.groovy | 4 ++-- .ci/jenkins/dsl/test.sh | 8 ++++---- .github/pull_request_template.md | 4 ++-- .github/workflows/full-downstream.yml | 2 +- .github/workflows/jenkins-tests-PR.yml | 4 ++-- .github/workflows/nightly.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci/environments/common/update_quarkus.sh b/.ci/environments/common/update_quarkus.sh index c08110472..2c2e70649 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/apache/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 ecbe194db..049bc1084 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { timeout(time: 360, unit: 'MINUTES') } environment { - BUILDCHAIN_PROJECT = 'apache/optaplanner-quickstarts' + BUILDCHAIN_PROJECT = 'apache/incubator-kie-optaplanner-quickstarts' BUILDCHAIN_CONFIG_REPO = 'optaplanner' BUILDCHAIN_CONFIG_FILE_PATH = '.ci/buildchain-config.yaml' diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 3354dd2bc..b6eb48ae6 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/apache/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/apache/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 diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh index 05cc5e160..5449b2638 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=apache/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/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} $@ \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 215998fbf..fb0fe2b06 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -22,8 +22,8 @@ and also the external https://github.com/quarkusio/quarkus-quickstarts/tree/main changes that span multiple apache repositories and depend on each other. --> diff --git a/.github/workflows/full-downstream.yml b/.github/workflows/full-downstream.yml index dffec7ce1..a628427ed 100644 --- a/.github/workflows/full-downstream.yml +++ b/.github/workflows/full-downstream.yml @@ -54,7 +54,7 @@ jobs: id: build-chain uses: kiegroup/github-action-build-chain@v3.1.10 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 cd504193a..126873047 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: 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 }} \ No newline at end of file diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f2cd82366..5206ce25b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -8,7 +8,7 @@ on: jobs: nightly: - if: github.repository == 'apache/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 e86921740..f5ee0ec27 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:apache}/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 From 8f3d0dbb0811ddfda69ef73c78f301f882428de0 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 10:48:20 +0200 Subject: [PATCH 4/6] updated repo names --- .ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile index 049bc1084..c30cda20c 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { script { // load `pr_check.groovy` file from kogito-pipelines:main dir('kogito-pipelines') { - checkout(githubscm.resolveRepository('kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds')) + checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds')) pr_check_script = load 'dsl/scripts/pr_check.groovy' } } From 5a0fbc8ce3e7d09a0683e20154869b825ab827b4 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 14:56:26 +0200 Subject: [PATCH 5/6] various updates --- .ci/jenkins/Jenkinsfile | 2 +- .ci/jenkins/Jenkinsfile.setup-branch | 2 +- .ci/jenkins/dsl/jobs.groovy | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile index c30cda20c..61d72e4f6 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { } environment { BUILDCHAIN_PROJECT = 'apache/incubator-kie-optaplanner-quickstarts' - BUILDCHAIN_CONFIG_REPO = 'optaplanner' + BUILDCHAIN_CONFIG_REPO = 'incubator-kie-optaplanner' BUILDCHAIN_CONFIG_FILE_PATH = '.ci/buildchain-config.yaml' OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM = '-Dfull' diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index bf839387b..d7320ce4a 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 b6eb48ae6..48d902e2b 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -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}", From 8fb547e0a8c29b6d416a3d31731307f04a51e7ad Mon Sep 17 00:00:00 2001 From: Jan Stastny Date: Mon, 18 Sep 2023 10:22:42 +0200 Subject: [PATCH 6/6] Adapt kiegroup to apache2 (#605) PR multibranchPipelineJob (#602) * PR multibranchPipelineJob * set Jenkinsfile timeout time as int --------- Co-authored-by: jstastny-cz