From b9b166376fe15d1496c9954a097d77159941902a Mon Sep 17 00:00:00 2001 From: radtriste Date: Fri, 8 Sep 2023 16:18:29 +0200 Subject: [PATCH 1/3] Update kiegroup repository references to apache --- .ci/jenkins/Jenkinsfile.setup-branch | 2 +- .ci/jenkins/dsl/jobs.groovy | 4 ++-- .ci/jenkins/dsl/test.sh | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/jenkins-tests-PR.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 127935025..70021ca80 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -48,7 +48,7 @@ pipeline { String displayVersion = "${branchSplit[0]}.${branchSplit[1]}-RC" String version = "${branchSplit[0]}.${branchSplit[1]}.0-SNAPSHOT" String prereleaseStr = 'rc' - String swExamplesURL = "https://github.com/kiegroup/kogito-examples/tree/${getBuildBranch()}/serverless-workflow-examples" + String swExamplesURL = "https://github.com/apache/kogito-examples/tree/${getBuildBranch()}/serverless-workflow-examples" String antoraFile = 'serverlessworkflow/antora.yml' String operatorVersion = "${getBuildBranch()}" diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index b7463b222..6b4c81f10 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 ad8af34ac..ca62f3d2c 100755 --- a/.ci/jenkins/dsl/test.sh +++ b/.ci/jenkins/dsl/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -e file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b8f847c1b..673a2028d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,7 @@ Please make sure that your PR meets the following requirements: -- [ ] You have read the [contributions doc](https://github.com/kiegroup/kogito-docs/blob/main/CONTRIBUTING.md) +- [ ] You have read the [contributions doc](https://github.com/apache/kogito-docs/blob/main/CONTRIBUTING.md) - [ ] Pull Request title is properly formatted: `KOGITO-XYZ Subject` - [ ] Pull Request title contains the target branch if not targeting main: `[0.9.x] KOGITO-XYZ Subject` - [ ] The nav.adoc file has a link to this guide in the proper category diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index bf3815cbc..9ed0f186f 100644 --- a/.github/workflows/jenkins-tests-PR.yml +++ b/.github/workflows/jenkins-tests-PR.yml @@ -17,6 +17,6 @@ jobs: - name: DSL tests uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main with: - main-config-file-repo: kiegroup/kogito-pipelines + main-config-file-repo: apache/kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/kogito-pipelines + branch-config-file-repo: apache/kogito-pipelines From a09889196039fa1c574b7580ce077cf8feae2116 Mon Sep 17 00:00:00 2001 From: radtriste Date: Mon, 11 Sep 2023 13:52:48 +0200 Subject: [PATCH 2/3] update references --- .ci/jenkins/Jenkinsfile.setup-branch | 2 +- .ci/jenkins/dsl/jobs.groovy | 4 ++-- .ci/jenkins/dsl/test.sh | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/jenkins-tests-PR.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 70021ca80..6887a7026 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -48,7 +48,7 @@ pipeline { String displayVersion = "${branchSplit[0]}.${branchSplit[1]}-RC" String version = "${branchSplit[0]}.${branchSplit[1]}.0-SNAPSHOT" String prereleaseStr = 'rc' - String swExamplesURL = "https://github.com/apache/kogito-examples/tree/${getBuildBranch()}/serverless-workflow-examples" + String swExamplesURL = "https://github.com/apache/incubator-kie-kogito-examples/tree/${getBuildBranch()}/serverless-workflow-examples" String antoraFile = 'serverlessworkflow/antora.yml' String operatorVersion = "${getBuildBranch()}" diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 6b4c81f10..bdc3106aa 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 ca62f3d2c..2d518eb9f 100755 --- a/.ci/jenkins/dsl/test.sh +++ b/.ci/jenkins/dsl/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -e file=$(mktemp) # For more usage of the script, use ./test.sh -h -curl -o ${file} https://raw.githubusercontent.com/apache/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh +curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh chmod u+x ${file} ${file} $@ \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 673a2028d..29492e695 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,7 @@ Please make sure that your PR meets the following requirements: -- [ ] You have read the [contributions doc](https://github.com/apache/kogito-docs/blob/main/CONTRIBUTING.md) +- [ ] You have read the [contributions doc](https://github.com/apache/incubator-kie-kogito-docs/blob/main/CONTRIBUTING.md) - [ ] Pull Request title is properly formatted: `KOGITO-XYZ Subject` - [ ] Pull Request title contains the target branch if not targeting main: `[0.9.x] KOGITO-XYZ Subject` - [ ] The nav.adoc file has a link to this guide in the proper category diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index 9ed0f186f..324a2deb1 100644 --- a/.github/workflows/jenkins-tests-PR.yml +++ b/.github/workflows/jenkins-tests-PR.yml @@ -17,6 +17,6 @@ jobs: - name: DSL tests uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main with: - main-config-file-repo: apache/kogito-pipelines + main-config-file-repo: apache/incubator-kie-kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: apache/kogito-pipelines + branch-config-file-repo: apache/incubator-kie-kogito-pipelines From f9410086cc79d855da8693f62ae996b435ce5bf7 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 12 Sep 2023 14:56:10 +0200 Subject: [PATCH 3/3] various updates --- .ci/jenkins/Jenkinsfile.post-release | 2 +- .ci/jenkins/Jenkinsfile.setup-branch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.post-release b/.ci/jenkins/Jenkinsfile.post-release index d0e8f345a..9f87cc128 100644 --- a/.ci/jenkins/Jenkinsfile.post-release +++ b/.ci/jenkins/Jenkinsfile.post-release @@ -38,7 +38,7 @@ pipeline { script { dir("kogito-docs-${getBuildBranch()}") { deleteDir() - checkout(githubscm.resolveRepository('kogito-docs', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) + checkout(githubscm.resolveRepository('incubator-kie-kogito-docs', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) sh "git checkout ${getBuildBranch()}" String antoraFile = 'serverlessworkflow/antora.yml' diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 6887a7026..7b2bc63e2 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -41,7 +41,7 @@ pipeline { dir("kogito-docs-${getBuildBranch()}") { deleteDir() - checkout(githubscm.resolveRepository('kogito-docs', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) + checkout(githubscm.resolveRepository('incubator-kie-kogito-docs', getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsID())) sh "git checkout ${getBuildBranch()}" String[] branchSplit = getBuildBranch().split("\\.") @@ -77,7 +77,7 @@ pipeline { script { dir('kogito-docs') { deleteDir() - checkout(githubscm.resolveRepository('kogito-docs', getGitAuthor(), 'main', false, getGitAuthorCredsID())) + checkout(githubscm.resolveRepository('incubator-kie-kogito-docs', getGitAuthor(), 'main', false, getGitAuthorCredsID())) sh 'git checkout main' updateYaml('antora-playbook.yml') { antoraConfig ->