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

Migrate zeebe repository to camunda organization #8915

Merged
merged 9 commits into from
Mar 23, 2022
68 changes: 68 additions & 0 deletions .ci/jobs/github_camunda.dsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// vim: set filetype=groovy:

organizationFolder('camunda') {

description('Jobs for https://github.com/camunda')
displayName('camunda')

organizations {
github {
repoOwner('camunda')
credentialsId('github-camunda-zeebe-app')

traits {
cleanBeforeCheckoutTrait {
extension {
deleteUntrackedNestedRepositories(false)
}
}
// Discover branches.
// Strategy ID 3 => Discover all branches.
gitHubBranchDiscovery {
strategyId 3
}
pruneStaleBranchTrait()
localBranchTrait()
sourceWildcardFilter {
includes('zeebe*')
excludes('')
}

// Disable sending Github status notifications in non-prod envs.
if (ENVIRONMENT != 'prod') {
notificationsSkip()
}
}
}
}

buildStrategies {
// Don't auto build discovered branches for non prod envs.
if (ENVIRONMENT == 'prod') {
// Builds regular branches whenever a change is detected.
buildRegularBranches()
}
}

orphanedItemStrategy {
discardOldItems {
numToKeep 10
}
}

triggers {
periodicFolderTrigger {
interval '8h'
}
}

properties {
// Avoid automatically build jobs on non-prod envs by org indexing.
// Note: The DSL name here is misleading. This config is for the branches that WILL be built automatically.
// So on prod env all branches will be built automatically but for non-prod no automatic builds.
noTriggerOrganizationFolderProperty {
branches (ENVIRONMENT == 'prod' ? '.*' : '')
}
}

}
4 changes: 2 additions & 2 deletions .ci/pipelines/docker_zeebe.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ spec:
stages {
stage('Prepare') {
steps {
git url: 'https://github.com/camunda-cloud/zeebe.git',
git url: 'https://github.com/camunda/zeebe.git',
branch: "${params.BRANCH}",
credentialsId: 'github-cloud-zeebe-app',
credentialsId: 'github-camunda-zeebe-app',
poll: false

container('maven') {
Expand Down
6 changes: 3 additions & 3 deletions .ci/pipelines/release_zeebe.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
GPG_PASS = credentials('password_maven_central_gpg_signing_key')
GPG_PUB_KEY = credentials('maven_central_gpg_signing_key_pub')
GPG_SEC_KEY = credentials('maven_central_gpg_signing_key_sec')
GITHUB_TOKEN = credentials('github-cloud-zeebe-app')
GITHUB_TOKEN = credentials('github-camunda-zeebe-app')
RELEASE_VERSION = "${params.RELEASE_VERSION}"
RELEASE_BRANCH = "release-${params.RELEASE_VERSION}"
DEVELOPMENT_VERSION = "${params.DEVELOPMENT_VERSION}"
Expand All @@ -81,9 +81,9 @@ spec:
stages {
stage('Prepare') {
steps {
git url: 'https://github.com/camunda-cloud/zeebe.git',
git url: 'https://github.com/camunda/zeebe.git',
branch: "${env.RELEASE_BRANCH}",
credentialsId: 'github-cloud-zeebe-app',
credentialsId: 'github-camunda-zeebe-app',
poll: false

container('maven') {
Expand Down
6 changes: 3 additions & 3 deletions .ci/pipelines/release_zeebe_java11.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
GPG_PASS = credentials('password_maven_central_gpg_signing_key')
GPG_PUB_KEY = credentials('maven_central_gpg_signing_key_pub')
GPG_SEC_KEY = credentials('maven_central_gpg_signing_key_sec')
GITHUB_TOKEN = credentials('github-cloud-zeebe-app')
GITHUB_TOKEN = credentials('github-camunda-zeebe-app')
RELEASE_VERSION = "${params.RELEASE_VERSION}"
RELEASE_BRANCH = "release-${params.RELEASE_VERSION}"
DEVELOPMENT_VERSION = "${params.DEVELOPMENT_VERSION}"
Expand All @@ -80,9 +80,9 @@ spec:
stages {
stage('Prepare') {
steps {
git url: 'https://github.com/camunda-cloud/zeebe.git',
git url: 'https://github.com/camunda/zeebe.git',
branch: "${env.RELEASE_BRANCH}",
credentialsId: 'github-cloud-zeebe-app',
credentialsId: 'github-camunda-zeebe-app',
poll: false

container('maven') {
Expand Down
4 changes: 2 additions & 2 deletions .ci/scripts/distribution/build-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ set -o pipefail

export CGO_ENABLED=0

ORG_DIR=${GOPATH}/src/github.com/camunda-cloud
ORG_DIR=${GOPATH}/src/github.com/camunda

mkdir -p "${ORG_DIR}"
ln -s "${PWD}" "${ORG_DIR}/zeebe"

cd "${ORG_DIR}/zeebe/clients/go"

PREFIX=github.com/camunda-cloud/zeebe/clients/go
PREFIX=github.com/camunda/zeebe/clients/go
EXCLUDE=""

for file in {internal,cmd/zbctl/internal}/*; do
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/distribution/test-go.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh -eux
ORG_DIR=${GOPATH}/src/github.com/camunda-cloud
ORG_DIR=${GOPATH}/src/github.com/camunda

cd "${ORG_DIR}/zeebe/clients/go"

Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/release/github-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ shopt -u nocasematch # reset it

# Perform release: create draft, upload assets, etc.
# See https://cli.github.com/manual/gh_release_create for more
gh release create --repo "camunda-cloud/zeebe" --draft --notes "Release ${RELEASE_VERSION}" \
gh release create --repo "camunda/zeebe" --draft --notes "Release ${RELEASE_VERSION}" \
--title "${RELEASE_VERSION}" "${GH_OPTIONS[@]}" \
"${RELEASE_VERSION}" "${ASSETS[@]}"
2 changes: 1 addition & 1 deletion .ci/scripts/release/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apt install -y gpg gh

# remove origin and use GitHub App (reflected on filesystem and globally active)
git remote remove origin
git remote add origin "https://${GITHUB_TOKEN_USR}:${GITHUB_TOKEN_PSW}@github.com/camunda-cloud/zeebe.git"
git remote add origin "https://${GITHUB_TOKEN_USR}:${GITHUB_TOKEN_PSW}@github.com/camunda/zeebe.git"

# configure Jenkins GitHub user for Maven container
git config --global user.email "ci@camunda.com"
Expand Down
4 changes: 2 additions & 2 deletions .ci/seed.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def seedJob = job('seed-job-zeebe') {
scm {
git {
remote {
github 'camunda-cloud/zeebe', 'https'
credentials 'github-cloud-zeebe-app'
github 'camunda/zeebe', 'https'
credentials 'github-camunda-zeebe-app'
}
branch 'main'
extensions {
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _All lines under and including the cut-off marker will be removed from the merge

Please check the items that apply, before requesting a review.

You can find more details about these items in our wiki page about [Pull Requests and Code Reviews](https://github.com/camunda-cloud/zeebe/wiki/Pull-Requests-and-Code-Reviews).
You can find more details about these items in our wiki page about [Pull Requests and Code Reviews](https://github.com/camunda/zeebe/wiki/Pull-Requests-and-Code-Reviews).

* [ ] I've reviewed my own code
* [ ] I've written a clear changelist description
Expand All @@ -31,7 +31,7 @@ _Not all items need to be done depending on the issue and the pull request._

Code changes:
* [ ] The changes are backwards compatibility with previous versions
* [ ] If it fixes a bug then PRs are created to [backport](https://github.com/zeebe-io/zeebe/compare/stable/0.24...main?expand=1&template=backport_template.md&title=[Backport%200.24]) the fix to the last two minor versions. You can trigger a backport by assigning labels (e.g. `backport stable/1.3`) to the PR, in case that fails you need to create backports manually.
* [ ] If it fixes a bug then PRs are created to [backport](https://github.com/camunda/zeebe/compare/stable/0.24...main?expand=1&template=backport_template.md&title=[Backport%200.24]) the fix to the last two minor versions. You can trigger a backport by assigning labels (e.g. `backport stable/1.3`) to the PR, in case that fails you need to create backports manually.

Testing:
* [ ] There are unit/integration tests that verify all acceptance criterias of the issue
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/project-new-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
GITHUB_TOKEN: ${{ secrets.PROJECT_ADMIN_TOKEN }}
with:
project_type: "org"
project_owner: "camunda-cloud"
project_owner: "camunda"
project_name: "Zeebe"
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ follow the following steps:
```
6. If you think you finished the issue please prepare the branch for reviewing.
Please consider our [pull requests and code
reviews](https://github.com/camunda-cloud/zeebe/wiki/Pull-Requests-and-Code-Reviews)
reviews](https://github.com/camunda/zeebe/wiki/Pull-Requests-and-Code-Reviews)
guide, before requesting a review. In general the commits should be squashed
into meaningful commits with a helpful message. This means cleanup/fix etc
commits should be squashed into the related commit. If you made refactorings
Expand All @@ -121,7 +121,7 @@ follow the following steps:

## Creating a pull request

Before opening your first pull request, please have a look at this [guide](https://github.com/camunda-cloud/zeebe/wiki/Pull-Requests-and-Code-Reviews#pull-requests).
Before opening your first pull request, please have a look at this [guide](https://github.com/camunda/zeebe/wiki/Pull-Requests-and-Code-Reviews#pull-requests).

1. To start the review process create a new pull request on GitHub from your
branch to the `main` branch. Give it a meaningful name and describe
Expand Down Expand Up @@ -152,7 +152,7 @@ Before opening your first pull request, please have a look at this [guide](https

## Reviewing a pull request

Before doing your first review, please have a look at this [guide](https://github.com/camunda-cloud/zeebe/wiki/Pull-Requests-and-Code-Reviews#code-reviews).
Before doing your first review, please have a look at this [guide](https://github.com/camunda/zeebe/wiki/Pull-Requests-and-Code-Reviews#code-reviews).

As a reviewer, you are encouraged to use the following [emoji code](#review-emoji-code) in your comments.

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Here is a diagram illustrating the lifecycle of minor releases over a 13-month p

## Status

To learn more about what we're currently working on, check the [GitHub issues](https://github.com/camunda-cloud/zeebe/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and the [latest commits](https://github.com/camunda-cloud/zeebe/commits/main).
To learn more about what we're currently working on, check the [GitHub issues](https://github.com/camunda/zeebe/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and the [latest commits](https://github.com/camunda/zeebe/commits/main).

## Helpful Links

* [Releases](https://github.com/camunda-cloud/zeebe/releases)
* [Releases](https://github.com/camunda/zeebe/releases)
* [Docker images](https://hub.docker.com/r/camunda/zeebe/tags?page=1&ordering=last_updated)
* [Blog](https://camunda.com/blog/category/process-automation-as-a-service/)
* [Documentation Home](https://docs.camunda.io)
* [Issue Tracker](https://github.com/camunda-cloud/zeebe/issues)
* [Issue Tracker](https://github.com/camunda/zeebe/issues)
* [User Forum](https://forum.camunda.io)
* [Slack Channel](https://zeebe-slack-invite.herokuapp.com/)
* [Contribution Guidelines](/CONTRIBUTING.md)
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/docs/setup/prometheus-operator-values.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ grafana:
dashboards:
default:
zeebe:
url: https://raw.githubusercontent.com/camunda-cloud/zeebe/main/monitor/grafana/zeebe.json
url: https://raw.githubusercontent.com/camunda/zeebe/main/monitor/grafana/zeebe.json
persistence:
enabled: true
storageClassName: ssd
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ to configure your benchmark.
### How to configure a Benchmark

The benchmark configuration is completely done via the `zeebe-values.yaml` file.
If there is a property missing which you want to change please open an issue in https://github.com/camunda-community-hub/camunda-cloud-helm
If there is a property missing which you want to change please open an issue in https://github.com/camunda/camunda-cloud-helm

#### Use different Zeebe Snapshot

Expand Down Expand Up @@ -97,7 +97,7 @@ Possible future extension point: Use https://docs.camunda.io/docs/apis-clients/c
### Setup Cloud Benchmark

* Create a new cloud benchmark in our benchmark folder, via `./newCloudBenchmark`. This will create a new namespace in our k8 cluster, such that we can deploy our starters and workers. They will connect to the camunda cloud cluster after we added the correct credentials.
* Edit the `cloudcredentials.yaml` file, replace the old/default values with your client credentials. **NOTE: Please make sure that you're not pushing your credentials to the repository!** https://github.com/camunda-cloud/zeebe/blob/main/benchmarks/setup/cloud-default/cloudcredentials.yaml contains an example.
* Edit the `cloudcredentials.yaml` file, replace the old/default values with your client credentials. **NOTE: Please make sure that you're not pushing your credentials to the repository!** https://github.com/camunda/zeebe/blob/main/benchmarks/setup/cloud-default/cloudcredentials.yaml contains an example.
* Deploy everything you need, e. g. run `make clean all` to deploy the secret, worker and starter. **Alternatively**, you can also manually provision the resources:
* `kubectl apply -f cloudcredentials.yaml`
* `kubectl apply -f worker.yaml`
Expand Down
1 change: 1 addition & 0 deletions benchmarks/setup/newBenchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ cd $namespace
sed_inplace "s/default/$namespace/g" Makefile starter.yaml timer.yaml simpleStarter.yaml worker.yaml

# get latest updates from zeebe repo
# TODO: rename the helm repo to camunda as well, Zelldon will do this
helm repo add camunda-cloud https://helm.camunda.io # skips if already exists
helm repo update
8 changes: 4 additions & 4 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<inceptionYear>2017</inceptionYear>

<scm>
<connection>scm:git:git@github.com:camunda-cloud/zeebe.git</connection>
<developerConnection>scm:git:git@github.com:camunda-cloud/zeebe.git</developerConnection>
<connection>scm:git:git@github.com:camunda/zeebe.git</connection>
<developerConnection>scm:git:git@github.com:camunda/zeebe.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/camunda-cloud/zeebe</url>
<url>https://github.com/camunda/zeebe</url>
</scm>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/camunda-cloud/zeebe/issues</url>
<url>https://github.com/camunda/zeebe/issues</url>
</issueManagement>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public static Object[][] parameters() {
singletonList(
expect(Message.class, "Must have exactly one zeebe:subscription extension element"))
},
{ // motivated by https://github.com/camunda-cloud/zeebe/issues/7131
{ // motivated by https://github.com/camunda/zeebe/issues/7131
getEventSubProcessWithEmbeddedSubProcessWithBoundaryEventWithoutCorrelationKey(),
singletonList(
expect(Message.class, "Must have exactly one zeebe:subscription extension element"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void shouldAbortOngoingTransitionWhenNewTransitionIsRequested() {
}

@Test
// regression test for https://github.com/camunda-cloud/zeebe/issues/7873
// regression test for https://github.com/camunda/zeebe/issues/7873
void shouldNotStartMultipleTransitions() {
// given
final var firstStepFirstTransitionFuture = TEST_CONCURRENCY_CONTROL.<Void>createFuture();
Expand Down Expand Up @@ -217,7 +217,7 @@ void shouldNotStartMultipleTransitions() {
}

@Test
// regression test for https://github.com/camunda-cloud/zeebe/issues/7873
// regression test for https://github.com/camunda/zeebe/issues/7873
void shouldExecuteTransitionsInOrder() {
// given
final var firstStepFirstTransitionFuture = TEST_CONCURRENCY_CONTROL.<Void>createFuture();
Expand Down
2 changes: 1 addition & 1 deletion clients/go/.gocompat.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions clients/go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ In order to do this please follow [this guide](../../gateway-protocol-impl/READM
To regenerate the gateway mock `internal/mock_pb/mock_gateway.go` run [`mockgen`](https://github.com/golang/mock#installation):

```
GO111MODULE=off mockgen github.com/camunda-cloud/zeebe/clients/go/pkg/pb GatewayClient,Gateway_ActivateJobsClient > internal/mock_pb/mock_gateway.go
GO111MODULE=off mockgen github.com/camunda/zeebe/clients/go/pkg/pb GatewayClient,Gateway_ActivateJobsClient > internal/mock_pb/mock_gateway.go
```

If you see errors regarding packages which are not found then as alternative you can try this:

```
GO111MODULE=off mockgen -source $GOPATH/src/github.com/camunda-cloud/zeebe/clients/go/pkg/pb/gateway.pb.go GatewayClient,Gateway_ActivateJobsClient > internal/mock_pb/mock_gateway.go
GO111MODULE=off mockgen -source $GOPATH/src/github.com/camunda/zeebe/clients/go/pkg/pb/gateway.pb.go GatewayClient,Gateway_ActivateJobsClient > internal/mock_pb/mock_gateway.go
```

### Integration tests

To run the integration tests, a Docker image for Zeebe must be built with the tag 'current-test'. To do that you can run (in the camunda-cloud/zeebe dir):
To run the integration tests, a Docker image for Zeebe must be built with the tag 'current-test'. To do that you can run (in the camunda/zeebe dir):

```
docker build --build-arg DISTBALL=dist/target/camunda-zeebe*.tar.gz -t camunda/zeebe:current-test --target app .
Expand Down
2 changes: 1 addition & 1 deletion clients/go/cmd/zbctl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rm -rf ${DIST_DIR}/*

for i in "${!OS[@]}"; do
if [ $# -eq 0 ] || [ ${OS[$i]} = $1 ]; then
CGO_ENABLED=0 GOOS="${OS[$i]}" GOARCH=amd64 go build -a -tags netgo -ldflags "-w -X github.com/camunda-cloud/zeebe/clients/go/cmd/zbctl/internal/commands.Version=${VERSION} -X github.com/camunda-cloud/zeebe/clients/go/cmd/zbctl/internal/commands.Commit=${COMMIT}" -o "${DIST_DIR}/${BINARY[$i]}" "${SRC_DIR}/main.go" &
CGO_ENABLED=0 GOOS="${OS[$i]}" GOARCH=amd64 go build -a -tags netgo -ldflags "-w -X github.com/camunda/zeebe/clients/go/cmd/zbctl/internal/commands.Version=${VERSION} -X github.com/camunda/zeebe/clients/go/cmd/zbctl/internal/commands.Commit=${COMMIT}" -o "${DIST_DIR}/${BINARY[$i]}" "${SRC_DIR}/main.go" &
fi
done

Expand Down
4 changes: 2 additions & 2 deletions clients/go/cmd/zbctl/internal/commands/activateJobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"time"

"github.com/camunda-cloud/zeebe/clients/go/pkg/commands"
"github.com/camunda-cloud/zeebe/clients/go/pkg/pb"
"github.com/camunda/zeebe/clients/go/pkg/commands"
"github.com/camunda/zeebe/clients/go/pkg/pb"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion clients/go/cmd/zbctl/internal/commands/cancelInstance.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package commands
import (
"context"
"fmt"
"github.com/camunda-cloud/zeebe/clients/go/pkg/pb"
"github.com/camunda/zeebe/clients/go/pkg/pb"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion clients/go/cmd/zbctl/internal/commands/completeJob.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package commands
import (
"context"
"fmt"
"github.com/camunda-cloud/zeebe/clients/go/pkg/pb"
"github.com/camunda/zeebe/clients/go/pkg/pb"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion clients/go/cmd/zbctl/internal/commands/createInstance.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package commands

import (
"context"
"github.com/camunda-cloud/zeebe/clients/go/pkg/commands"
"github.com/camunda/zeebe/clients/go/pkg/commands"
"github.com/spf13/cobra"
"strconv"
"strings"
Expand Down