summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-11-04 21:52:31 +0100
committermergify-bot <noreply@mergify.io>2021-11-05 09:23:31 +0000
commit04891cd8459b8a99e0b2bc9252c05e88b2e2beff (patch)
tree660f854b3acd2a7ea7463cb44397ee8368161d6a
parent22be4fb831afd2d2227352fce83aaf28a7495147 (diff)
downloadrabbitmq-server-git-04891cd8459b8a99e0b2bc9252c05e88b2e2beff.tar.gz
Adopt the new buildbuddy remote execution url
Buildbuddy reached out and expects it should be more reliable (cherry picked from commit f9f751f1b658bd97adb547038be7cc689fe6ccb8) # Conflicts: # .github/workflows/perform-bazel-execution-comparison.yaml # .github/workflows/test-erlang-git.yaml
-rw-r--r--.bazelrc6
-rw-r--r--.github/workflows/perform-bazel-execution-comparison.yaml96
-rw-r--r--.github/workflows/rabbitmq_peer_discovery_aws.yaml5
-rw-r--r--.github/workflows/test-erlang-git.yaml43
-rw-r--r--.github/workflows/test-mixed-versions.yaml10
-rw-r--r--.github/workflows/test.yaml10
6 files changed, 147 insertions, 23 deletions
diff --git a/.bazelrc b/.bazelrc
index 6123579af2..db6847973d 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,15 +2,15 @@ build --incompatible_strict_action_env
build --local_test_jobs=1
build:buildbuddy --bes_results_url=https://app.buildbuddy.io/invocation/
-build:buildbuddy --bes_backend=grpcs://cloud.buildbuddy.io
-build:buildbuddy --remote_cache=grpcs://cloud.buildbuddy.io
+build:buildbuddy --bes_backend=grpcs://remote.buildbuddy.io
+build:buildbuddy --remote_cache=grpcs://remote.buildbuddy.io
build:buildbuddy --remote_timeout=1200
build:buildbuddy --grpc_keepalive_time=30s
build:buildbuddy --build_metadata=REPO_URL=https://github.com/rabbitmq/rabbitmq-server.git
build:rbe --config=buildbuddy
-build:rbe --remote_executor=grpcs://cloud.buildbuddy.io
+build:rbe --remote_executor=grpcs://remote.buildbuddy.io
build:rbe --crosstool_top=@buildbuddy_toolchain//:toolchain
build:rbe --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
diff --git a/.github/workflows/perform-bazel-execution-comparison.yaml b/.github/workflows/perform-bazel-execution-comparison.yaml
new file mode 100644
index 0000000000..4834cd1bf0
--- /dev/null
+++ b/.github/workflows/perform-bazel-execution-comparison.yaml
@@ -0,0 +1,96 @@
+name: Gather Bazel Execution Logs
+on:
+ workflow_dispatch:
+ inputs:
+ target:
+ description: 'A bazel label representing the test target'
+ required: true
+ default: '//deps/rabbit:rabbit_stream_queue_SUITE'
+env:
+ ERLANG_MAJOR: "24"
+ CACHE_NAME: ci-bazel-cache-analysis
+jobs:
+ run-a:
+ name: Run A
+ runs-on: ubuntu-latest
+ timeout-minutes: 120
+ steps:
+ - name: CHECKOUT REPOSITORY
+ uses: actions/checkout@v2.4.0
+ - name: CONFIGURE BAZEL
+ run: |
+ cat << EOF >> user.bazelrc
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
+
+ build:buildbuddy --build_metadata=ROLE=CI
+ build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${CACHE_NAME}
+ EOF
+ - name: RUN TESTS
+ run: |
+ bazelisk test ${{ github.event.inputs.target }} \
+ --config=rbe-${ERLANG_MAJOR} \
+ --execution_log_binary_file=/tmp/exec.log
+ - name: SAVE EXECUTION LOG BINARY
+ uses: actions/upload-artifact@v2-preview
+ with:
+ name: execution-log-binary-A
+ path: /tmp/exec.log
+ run-b:
+ name: Run B
+ needs: run-a
+ runs-on: ubuntu-latest
+ timeout-minutes: 120
+ steps:
+ - name: CHECKOUT REPOSITORY
+ uses: actions/checkout@v2.4.0
+ - name: CONFIGURE BAZEL
+ run: |
+ cat << EOF >> user.bazelrc
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
+
+ build:buildbuddy --build_metadata=ROLE=CI
+ build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${CACHE_NAME}
+ EOF
+ - name: RUN TESTS
+ run: |
+ bazelisk test ${{ github.event.inputs.target }} \
+ --config=rbe-${ERLANG_MAJOR} \
+ --execution_log_binary_file=/tmp/exec.log
+ - name: SAVE EXECUTION LOG BINARY
+ uses: actions/upload-artifact@v2-preview
+ with:
+ name: execution-log-binary-B
+ path: /tmp/exec.log
+ parse-logs:
+ name: Parse Logs
+ needs: [run-a, run-b]
+ runs-on: ubuntu-latest
+ steps:
+ - name: CHECKOUT BAZEL
+ uses: actions/checkout@v2.4.0
+ with:
+ repository: bazelbuild/bazel
+ path: bazel
+ - name: MOUNT BAZEL CACHE
+ uses: actions/cache@v2
+ with:
+ path: "/home/runner/.cache/bazel"
+ key: bazel
+ - name: BUILD EXECLOG PARSER
+ working-directory: bazel
+ run: |
+ bazelisk build src/tools/execlog:parser
+ - name: FETCH LOGS
+ uses: actions/download-artifact@v2
+ - name: PARSE LOGS
+ run: |
+ bazel/bazel-bin/src/tools/execlog/parser \
+ --log_path=./execution-log-binary-A/exec.log \
+ --log_path=./execution-log-binary-B/exec.log \
+ --output_path=/tmp/execution-log-binary-A.log.txt \
+ --output_path=/tmp/execution-log-binary-B.log.txt
+ - name: SAVE PARSED LOGS
+ uses: actions/upload-artifact@v2-preview
+ with:
+ name: parsed-logs
+ path: /tmp/execution-log-binary-*.log.txt
diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
index f86aea41d4..2c34701962 100644
--- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml
+++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
@@ -28,11 +28,8 @@ jobs:
wait-interval: 30 # seconds
- name: CONFIGURE BAZEL
run: |
- echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
- echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
cat << EOF >> user.bazelrc
- build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
- build:buildbuddy --tls_client_key=buildbuddy-key.pem
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
diff --git a/.github/workflows/test-erlang-git.yaml b/.github/workflows/test-erlang-git.yaml
new file mode 100644
index 0000000000..8a6161ac48
--- /dev/null
+++ b/.github/workflows/test-erlang-git.yaml
@@ -0,0 +1,43 @@
+name: Test Erlang Git Master
+on:
+ schedule:
+ - cron: '0 2 * * *'
+ workflow_dispatch:
+jobs:
+ test-erlang-git:
+ name: Test (Erlang Git Master)
+ runs-on: ubuntu-18.04
+ timeout-minutes: 120
+ steps:
+ - name: CHECKOUT REPOSITORY
+ uses: actions/checkout@v2.4.0
+ - name: UPDATE RBE IMAGE SHA
+ env:
+ IMAGE: pivotalrabbitmq/rabbitmq-server-buildenv
+ TAG: linux-erlang-git-master
+ run: |
+ # buildbuddy caches the container image, so we must use a specific sha to ensure
+ # the latest is used
+ DIGEST="$(skopeo inspect --format '{{.Digest}}' docker://${IMAGE}:${TAG})"
+ echo "Will use ${IMAGE}@${DIGEST}"
+ sudo npm install --global --silent @bazel/buildozer
+ npx buildozer \
+ "dict_set exec_properties container-image:docker://${IMAGE}@${DIGEST}" \
+ //:erlang_git_platform
+ - name: CONFIGURE BAZEL
+ run: |
+ cat << EOF >> user.bazelrc
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
+
+ build:buildbuddy --build_metadata=ROLE=CI
+ build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
+ build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-erlang-git
+ EOF
+ #! - name: Setup tmate session
+ #! uses: mxschmitt/action-tmate@v3
+ - name: RUN TESTS
+ run: |
+ bazelisk test //... \
+ --config=rbe-git \
+ --test_tag_filters=-mixed-version-cluster,-exclusive,-aws \
+ --verbose_failures
diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml
index f674632464..91e90db8e9 100644
--- a/.github/workflows/test-mixed-versions.yaml
+++ b/.github/workflows/test-mixed-versions.yaml
@@ -33,11 +33,8 @@ jobs:
uses: actions/checkout@v2.3.4
- name: CONFIGURE BAZEL
run: |
- echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
- echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
cat << EOF >> user.bazelrc
- build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
- build:buildbuddy --tls_client_key=buildbuddy-key.pem
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
@@ -72,11 +69,8 @@ jobs:
run: |
ERLANG_HOME="$(dirname $(dirname $(which erl)))"
ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
- echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
- echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
cat << EOF >> user.bazelrc
- build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
- build:buildbuddy --tls_client_key=buildbuddy-key.pem
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index cf99bcc14f..d75635094b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -29,11 +29,8 @@ jobs:
uses: actions/checkout@v2.3.4
- name: CONFIGURE BAZEL
run: |
- echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
- echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
cat << EOF >> user.bazelrc
- build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
- build:buildbuddy --tls_client_key=buildbuddy-key.pem
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
@@ -68,11 +65,8 @@ jobs:
run: |
ERLANG_HOME="$(dirname $(dirname $(which erl)))"
ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
- echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
- echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
cat << EOF >> user.bazelrc
- build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
- build:buildbuddy --tls_client_key=buildbuddy-key.pem
+ build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE