From 60470dcd466cdd143132032c8fceae61f5bab834 Mon Sep 17 00:00:00 2001 From: Mandy Chen Date: Tue, 29 Jul 2025 13:32:37 -0700 Subject: [PATCH] Remove references to buildkite --- .buildkite/pipeline.yml | 122 ------------------------ .buildkite/scripts/coverage_metadata.sh | 13 --- .buildkite/scripts/lint.sh | 14 --- CONTRIBUTING.md | 4 +- README.md | 2 +- docker/buildkite/Dockerfile | 37 ------- docker/buildkite/README.md | 22 ----- docker/buildkite/docker-compose.yaml | 97 ------------------- 8 files changed, 3 insertions(+), 308 deletions(-) delete mode 100644 .buildkite/pipeline.yml delete mode 100755 .buildkite/scripts/coverage_metadata.sh delete mode 100755 .buildkite/scripts/lint.sh delete mode 100644 docker/buildkite/Dockerfile delete mode 100644 docker/buildkite/README.md delete mode 100644 docker/buildkite/docker-compose.yaml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml deleted file mode 100644 index fcad3a0ae..000000000 --- a/.buildkite/pipeline.yml +++ /dev/null @@ -1,122 +0,0 @@ -container: - kubernetes: &kubernetes - gitEnvFrom: - - secretRef: - name: oss-github-ssh-credentials - sidecars: - - image: us-west1-docker.pkg.dev/ci-compute/buildkite-images/buildkite-dind:v1 - volumeMounts: - - mountPath: /var/run/ - name: docker-sock - securityContext: - privileged: true - allowPrivilegeEscalation: true - mirrorVolumeMounts: true # CRITICAL: this must be at the same indentation level as sidecars - podSpec: &podSpec - containers: - - &commandContainer - image: us-west1-docker.pkg.dev/ci-compute/buildkite-images/buildkite-command-container:v2 - command: - - |- - echo "Command step was not overridden." - exit 1 - volumeMounts: - - mountPath: /var/run/ - name: docker-sock - resources: - requests: - cpu: 7500m - memory: 60G - volumes: - - name: docker-sock - emptyDir: {} - -agents: - queue: buildkite-gcp - -steps: - - label: "Lint Check" - plugins: - - kubernetes: - <<: *kubernetes - podSpec: - <<: *podSpec - containers: - - <<: *commandContainer - command: - - |- - .buildkite/scripts/lint.sh - - docker-compose#v3.0.0: - run: unit-test-test-service - config: docker/buildkite/docker-compose.yaml - - - label: ":java: Unit test with test services" - artifact_paths: - - "build/reports/tests/test/**/*" - - "build/reports/jacoco/test/jacocoTestReport.xml" - - "build/reports/metadata.txt" - timeout_in_minutes: 30 - retry: - automatic: - - exit_status: "*" - limit: 3 - plugins: - - kubernetes: - <<: *kubernetes - podSpec: - <<: *podSpec - containers: - - <<: *commandContainer - command: - - |- - ./gradlew --no-daemon test jacocoTestReport - .buildkite/scripts/coverage_metadata.sh build/reports/metadata.txt - - docker-compose#v3.0.0: - run: unit-test-test-service - config: docker/buildkite/docker-compose.yaml - - - label: ":java: Unit test with docker services sticky on" - timeout_in_minutes: 50 # integration tests take longer - retry: - automatic: - - exit_status: "*" - limit: 3 - artifact_paths: - - "build/reports/tests/test/**/*" - plugins: - - kubernetes: - <<: *kubernetes - podSpec: - <<: *podSpec - containers: - - <<: *commandContainer - command: - - |- - ./gradlew --no-daemon test - - docker-compose#v3.0.0: - run: unit-test-docker-sticky-on - config: docker/buildkite/docker-compose.yaml - - - label: ":java: Unit test with docker services sticky off" - timeout_in_minutes: 50 # integration tests take longer - retry: - automatic: - - exit_status: "*" - limit: 3 - artifact_paths: - - "build/reports/tests/test/**/*" - plugins: - - kubernetes: - <<: *kubernetes - podSpec: - <<: *podSpec - containers: - - <<: *commandContainer - command: - - |- - ./gradlew --no-daemon test - - docker-compose#v3.0.0: - run: unit-test-docker-sticky-off - config: docker/buildkite/docker-compose.yaml - -# TODO: delete this file after migration to github actions diff --git a/.buildkite/scripts/coverage_metadata.sh b/.buildkite/scripts/coverage_metadata.sh deleted file mode 100755 index 4296e01d6..000000000 --- a/.buildkite/scripts/coverage_metadata.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -ex -# This script generates coverage metadata for the coverage report. -# Output is used by SonarQube integration in Uber and not used by OS repo coverage tool itself. -# Example output: -# commit-sha: 6953daa563e8e44512bc349c9608484cfd4ec4ff -# timestamp: 2024-03-04T19:29:16Z -output_path="$1" -echo "commit-sha: $(git rev-parse HEAD)" > "$output_path" -echo "timestamp: $(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$output_path" -echo "Coverage metadata written to $output_path" - -# TODO: delete this file after migration to github actions diff --git a/.buildkite/scripts/lint.sh b/.buildkite/scripts/lint.sh deleted file mode 100755 index 1b7a19f44..000000000 --- a/.buildkite/scripts/lint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -ex - -./gradlew goJF - -if [ -n "$(git status --porcelain)" ]; then - echo "There are changes after linting (used goJF) cmd: ./gradlew goJF" - echo "Please rerun the command and commit the changes" - git status --porcelain - exit 1 -fi - -# TODO: delete this file after migration to github actions diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 191e7bd0f..d00215bad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -97,5 +97,5 @@ And sometimes it's important to test the non-sticky mode STICKY_OFF=true USE_DOCKER_SERVICE=true ./gradlew test ``` -Also, if there is any Buildkite test failure that you cannot reproduce locally, -follow [buildkite docker-compose](./docker/buildkite/README.md) instructions to run the tests. +Also, if there is any Github Actions test failure that you cannot reproduce locally, +follow [github action docker-compose](./docker/github_actions/README.md) instructions to run the tests. diff --git a/README.md b/README.md index 8c41b7758..bc6c33bae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Java framework for Cadence [![Build Status](https://badge.buildkite.com/0c96b8b74c0921208e898c10a602e2fe9ecb7641c2befee0e7.svg?theme=github&branch=master)](https://buildkite.com/uberopensource/cadence-java-client) [![Javadocs](https://www.javadoc.io/badge/com.uber.cadence/cadence-client.svg)](https://www.javadoc.io/doc/com.uber.cadence/cadence-client) [![codecov](https://codecov.io/gh/cadence-workflow/cadence-java-client/graph/badge.svg?token=eVBGf4EmXr)](https://codecov.io/gh/cadence-workflow/cadence-java-client) +# Java framework for Cadence [![CI Checks](https://github.com/cadence-workflow/cadence-java-client/actions/workflows/ci-checks.yml/badge.svg)](https://github.com/cadence-workflow/cadence-java-client/actions/workflows/ci-checks.yml) [![Javadocs](https://www.javadoc.io/badge/com.uber.cadence/cadence-client.svg)](https://www.javadoc.io/doc/com.uber.cadence/cadence-client) [![codecov](https://codecov.io/gh/cadence-workflow/cadence-java-client/graph/badge.svg?token=eVBGf4EmXr)](https://codecov.io/gh/cadence-workflow/cadence-java-client) [Cadence](https://github.com/uber/cadence) is a distributed, scalable, durable, and highly available orchestration engine we developed at Uber Engineering to execute asynchronous long-running business logic in a scalable and resilient way. diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile deleted file mode 100644 index b192fd72a..000000000 --- a/docker/buildkite/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Always use a release version or a specific commit hash below. Don't use -# a branch name since we'd keep getting updates as long as there are new -# commits to that branch and one of them can break the build -FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine - -# Apache Thrift version -ENV APACHE_THRIFT_VERSION=0.9.3 - -# Install dependencies using apk -RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc -# Git is needed in order to update the dls submodule -RUN apk add git libstdc++ bash curl - -# Install buildkite agent -# https://buildkite.com/docs/agent/v3/linux -RUN bash -c "`curl -sL https://raw.githubusercontent.com/buildkite/agent/main/install.sh`" -RUN ln -s /root/.buildkite-agent/bin/buildkite-agent /usr/bin/buildkite-agent - -# Compile source -RUN set -ex ;\ - wget https://archive.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz && \ - tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz && \ - rm thrift-${APACHE_THRIFT_VERSION}.tar.gz && \ - cd thrift-${APACHE_THRIFT_VERSION}/ && \ - ./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no && \ - make && \ - make install && \ - cd .. && \ - rm -rf thrift-${APACHE_THRIFT_VERSION} - -# Cleanup packages and remove cache -RUN apk del build-dependencies wget && rm -rf /var/cache/apk/* - -RUN mkdir /cadence-java-client -WORKDIR /cadence-java-client - -# TODO: delete this file after migration to github actions diff --git a/docker/buildkite/README.md b/docker/buildkite/README.md deleted file mode 100644 index decf6bb94..000000000 --- a/docker/buildkite/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# Debug Builkite integration test -Sometimes the environment on IDE may be different as Buildkite. -You can run the following command to trigger the same test as running on Buildkite: - -```bash -docker-compose -f docker-compose.yaml run unit-test-docker-sticky-on &> test.log -``` -Or -```bash -docker-compose -f docker-compose.yaml run unit-test-docker-sticky-off &> test.log -``` - -Or -```bash -docker-compose -f docker-compose.yaml run unit-test-test-service &> test.log -``` - -And finally make sure to shutdown all docker resources: -```bash -docker-compose down -``` -TODO: delete this file after migration to github actions diff --git a/docker/buildkite/docker-compose.yaml b/docker/buildkite/docker-compose.yaml deleted file mode 100644 index 44cab51e7..000000000 --- a/docker/buildkite/docker-compose.yaml +++ /dev/null @@ -1,97 +0,0 @@ -version: '3.5' - -services: - cassandra: - image: cassandra:4.1.3 - deploy: - resources: - limits: - cpus: '4' - memory: 12000M - ports: - - "9042:9042" - - statsd: - image: hopsoft/graphite-statsd - deploy: - resources: - limits: - cpus: '0.50' - memory: 1024M - ports: - - "8080:80" - - "2003:2003" - - "8125:8125" - - "8126:8126" - - cadence: - image: ubercadence/server:master-auto-setup - deploy: - resources: - limits: - cpus: '2' - memory: 8192M - ports: - - "7933:7933" - - "7934:7934" - - "7935:7935" - - "7939:7939" - environment: - - "CASSANDRA_SEEDS=cassandra" - - "STATSD_ENDPOINT=statsd:8125" - depends_on: - - cassandra - - statsd - - unit-test-docker-sticky-off: - build: - context: ../../ - dockerfile: ./docker/buildkite/Dockerfile - command: "./gradlew --no-daemon test" - deploy: - resources: - limits: - cpus: '2' - memory: 8192M - environment: - - "USER=unittest" - - "CADENCE_SEEDS=cadence" - - "USE_DOCKER_SERVICE=true" - - "STICKY_OFF=true" - depends_on: - - cadence - volumes: - - "../../:/cadence-java-client" - - unit-test-docker-sticky-on: - build: - context: ../../ - dockerfile: ./docker/buildkite/Dockerfile - command: "./gradlew --no-daemon test" - deploy: - resources: - limits: - cpus: '2' - memory: 8192M - environment: - - "USER=unittest" - - "CADENCE_SEEDS=cadence" - - "USE_DOCKER_SERVICE=true" - - "STICKY_OFF=false" - depends_on: - - cadence - volumes: - - "../../:/cadence-java-client" - - unit-test-test-service: - build: - context: ../../ - dockerfile: ./docker/buildkite/Dockerfile - command: "./gradlew --no-daemon test" - environment: - - "USER=unittest" - - "USE_DOCKER_SERVICE=false" - volumes: - - "../../:/cadence-java-client" - -# TODO: delete this file after migration to github actions