Skip to content

Commit

Permalink
build: update CI to use renamed artifact
Browse files Browse the repository at this point in the history
  • Loading branch information
npepinpe committed Mar 15, 2022
1 parent 33d7abd commit 00bb446
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh -eux

echo "Building Zeebe Docker image ${IMAGE}:${TAG}"
docker build --no-cache --build-arg DISTBALL=camunda-cloud-zeebe.tar.gz -t ${IMAGE}:${TAG} --target app .
docker build --no-cache --build-arg DISTBALL=camunda-zeebe.tar.gz -t ${IMAGE}:${TAG} --target app .
4 changes: 2 additions & 2 deletions .ci/scripts/docker/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

mvn dependency:get -B \
-DremoteRepositories="camunda-nexus::::https://app.camunda.com/nexus/content/repositories/public" \
-DgroupId="io.camunda" -DartifactId="camunda-cloud-zeebe" \
-DgroupId="io.camunda" -DartifactId="camunda-zeebe" \
-Dversion="${VERSION}" -Dpackaging="tar.gz" -Dtransitive=false

mvn dependency:copy -B \
-Dartifact="io.camunda:camunda-cloud-zeebe:${VERSION}:tar.gz" \
-Dartifact="io.camunda:camunda-zeebe:${VERSION}:tar.gz" \
-DoutputDirectory=${WORKSPACE} \
-Dmdep.stripVersion=true
4 changes: 2 additions & 2 deletions .ci/scripts/release/github-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ declare -a GH_OPTIONS=()
# compute their sha1 sum and upload those as well, but no need to list that here. If there are new
# binaries to ship with a Zeebe release, add them here.
declare -a ARTIFACTS=( \
"dist/target/camunda-cloud-zeebe-${RELEASE_VERSION}.tar.gz" \
"dist/target/camunda-cloud-zeebe-${RELEASE_VERSION}.zip" \
"dist/target/camunda-zeebe-${RELEASE_VERSION}.tar.gz" \
"dist/target/camunda-zeebe-${RELEASE_VERSION}.zip" \
"clients/go/cmd/zbctl/dist/zbctl" \
"clients/go/cmd/zbctl/dist/zbctl.exe" \
"clients/go/cmd/zbctl/dist/zbctl.darwin" \
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pipeline {
}
steps {
timeout(time: shortTimeoutMinutes, unit: 'MINUTES') {
// since zbctl is included in camunda-cloud-zeebe.tar.gz, which is produced by
// since zbctl is included in camunda-zeebe.tar.gz, which is produced by
// maven, we have to build the go artifacts first
container('golang') {
sh '.ci/scripts/distribution/build-go.sh'
Expand All @@ -102,10 +102,10 @@ pipeline {

// to simplify building the Docker image, we copy the distribution to a fixed
// filename that doesn't include the version
runMavenContainerCommand('cp dist/target/camunda-cloud-zeebe-*.tar.gz camunda-cloud-zeebe.tar.gz')
runMavenContainerCommand('cp dist/target/camunda-zeebe-*.tar.gz camunda-zeebe.tar.gz')

container('python') {
gcloudSaveTmpFile('zeebe-distro', ['camunda-cloud-zeebe.tar.gz'])
gcloudSaveTmpFile('zeebe-distro', ['camunda-zeebe.tar.gz'])

sh "tar -cf zeebe-build.tar ./m2-repository/io/camunda/*/${VERSION}/*"
gcloudSaveTmpFile('zeebe-build', ['zeebe-build.tar'])
Expand Down Expand Up @@ -274,7 +274,7 @@ pipeline {
steps {
timeout(time: shortTimeoutMinutes, unit: 'MINUTES') {
container('python') {
gcloudRestoreTmpFile('zeebe-distro', ['camunda-cloud-zeebe.tar.gz'])
gcloudRestoreTmpFile('zeebe-distro', ['camunda-zeebe.tar.gz'])
}
container('docker') {
sh '.ci/scripts/docker/build.sh'
Expand Down
2 changes: 1 addition & 1 deletion createBenchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ set -x

mvn clean install -DskipTests -DskipChecks -T1C

docker build --build-arg DISTBALL=dist/target/camunda-cloud-zeebe-*.tar.gz --build-arg APP_ENV=dev -t "gcr.io/zeebe-io/zeebe:$benchmark" .
docker build --build-arg DISTBALL=dist/target/camunda-zeebe-*.tar.gz --build-arg APP_ENV=dev -t "gcr.io/zeebe-io/zeebe:$benchmark" .
docker push "gcr.io/zeebe-io/zeebe:$benchmark"

cd benchmarks/project
Expand Down
4 changes: 2 additions & 2 deletions recreateBenchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ set -x

mvn clean install -DskipTests -DskipChecks -T1C

docker build --build-arg DISTBALL=dist/target/camunda-cloud-zeebe-*.tar.gz --build-arg APP_ENV=dev -t "gcr.io/zeebe-io/zeebe:$benchmark" .
docker build --build-arg DISTBALL=dist/target/camunda-zeebe-*.tar.gz --build-arg APP_ENV=dev -t "gcr.io/zeebe-io/zeebe:$benchmark" .
docker push "gcr.io/zeebe-io/zeebe:$benchmark"

cd "$pwd/benchmarks/project"
Expand All @@ -70,4 +70,4 @@ kubectl -n "$benchmark" get pods -l app.kubernetes.io/name=zeebe-cluster-helm -o
| xargs kubectl -n "$benchmark" delete pod

# Return where you started
cd "$pwd"
cd "$pwd"

0 comments on commit 00bb446

Please sign in to comment.