root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove remaining buildbuddy usage 

(cherry picked from commit a2709dfd05)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit b38dc84db5)

# Conflicts:
#	bazel/bzlmod/secondary_umbrella.bzl
This commit is contained in:
Rin Kuryloski 2024-06-18 14:42:14 +02:00 committed by Mergify
parent 52be6df3f0
commit f28ec6c5ed
8 changed files with 88 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.github/workflows/templates/test-mixed-versions.template.yaml vendored
View File

@ -76,9 +76,9 @@ jobs:
fi fi
echo "exists=${exists}" | tee $GITHUB_ENV echo "exists=${exists}" | tee $GITHUB_ENV
OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-} OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz} OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v} VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
VERSION=${VERSION%*.tar.xz} VERSION=${VERSION%*.tar.xz}
@ -89,35 +89,42 @@ jobs:
with: with:
ref: v${{ steps.check.outputs.version }} ref: v${{ steps.check.outputs.version }}
path: secondary-umbrella path: secondary-umbrella
- name: CONFIGURE OTP & ELIXIR
if: env.exists != 'true'
uses: erlef/setup-beam@v1.17
with:
otp-version: ${{ steps.check.outputs.otp_version }}
elixir-version: 1.15
hexpm-mirrors: |
https://builds.hex.pm
https://cdn.jsdelivr.net/hex
- name: AUTHENTICATE TO GOOGLE CLOUD
uses: google-github-actions/auth@v2.1.3
with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: BUILD SECONDARY UMBRELLA ARCHIVE - name: BUILD SECONDARY UMBRELLA ARCHIVE
if: env.exists != 'true' if: env.exists != 'true'
working-directory: secondary-umbrella working-directory: secondary-umbrella
run: | run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }} build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
build --google_default_credentials
build --remote_download_toplevel
EOF EOF
fi fi
cat << EOF >> user.bazelrc
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
build:buildbuddy --color=yes
build:buildbuddy --remote_download_toplevel
EOF
sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
bazelisk build :package-generic-unix \ bazelisk build :package-generic-unix \
--config=rbe-${{ steps.check.outputs.otp_version_id }} \
--test_build \ --test_build \
--verbose_failures --verbose_failures
OUTPUT_DIR=${{ github.workspace }}/output OUTPUT_DIR=${{ github.workspace }}/output
mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }} mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
cp \ cp \
bazel-bin/package-generic-unix.tar.xz \ bazel-bin/package-generic-unix.tar.xz \
${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
- name: UPLOAD THE ARCHIVE TO S3 - name: UPLOAD THE ARCHIVE TO S3
if: env.exists != 'true' if: env.exists != 'true'
uses: jakejarvis/s3-sync-action@v0.5.1 uses: jakejarvis/s3-sync-action@v0.5.1

22
.github/workflows/test-authnz.yaml vendored
View File

@ -52,24 +52,32 @@ jobs:
with: with:
otp-version: ${{ matrix.erlang_version }} otp-version: ${{ matrix.erlang_version }}
elixir-version: ${{ matrix.elixir_version }} elixir-version: ${{ matrix.elixir_version }}
hexpm-mirrors: |
https://builds.hex.pm
https://cdn.jsdelivr.net/hex
- name: Authenticate To Google Cloud
uses: google-github-actions/auth@v2.1.3
with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: Configure Bazel - name: Configure Bazel
run: | run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }} build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
build --google_default_credentials
build --remote_download_toplevel
EOF EOF
fi fi
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --build_metadata=ROLE=CI build --color=yes
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
build:buildbuddy --color=yes
EOF EOF
- name: Build & Load RabbitMQ OCI - name: Build & Load RabbitMQ OCI
run: | run: |
bazelisk run packaging/docker-image:rabbitmq-amd64 \ bazelisk run packaging/docker-image:rabbitmq-amd64
--config=buildbuddy
- name: Configure Docker Network - name: Configure Docker Network
run: | run: |

40
.github/workflows/test-erlang-git.yaml vendored
View File

@ -1,40 +0,0 @@
name: Test Erlang Git Master
on:
schedule:
- cron: '0 2 * * *'
workflow_dispatch:
jobs:
test-erlang-git:
name: Test (Erlang Git Master)
runs-on: ubuntu-22.04
timeout-minutes: 120
steps:
- name: CHECKOUT REPOSITORY
uses: actions/checkout@v4
- name: CONFIGURE BAZEL
run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
EOF
fi
cat << EOF >> user.bazelrc
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
build:buildbuddy --color=yes
build:rbe --platforms=//bazel/platforms:erlang_linux_git_master_platform
EOF
bazelisk info release
#! - name: Setup tmate session
#! uses: mxschmitt/action-tmate@v3
- name: RUN TESTS
run: |
sudo sysctl -w net.ipv4.tcp_keepalive_time=60
sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
bazelisk test //... \
--config=rbe \
--test_tag_filters=-mixed-version-cluster,-aws,-docker \
--build_tests_only \
--verbose_failures

39
.github/workflows/test-mixed-versions.yaml vendored
View File

@ -54,9 +54,9 @@ jobs:
fi fi
echo "exists=${exists}" | tee $GITHUB_ENV echo "exists=${exists}" | tee $GITHUB_ENV
OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-} OTP_VERSION=${ARCHIVE_URL#*secondary-umbrellas/}
OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz} OTP_VERSION=${OTP_VERSION%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT echo "otp_version=${OTP_VERSION}" | tee -a $GITHUB_OUTPUT
VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v} VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
VERSION=${VERSION%*.tar.xz} VERSION=${VERSION%*.tar.xz}
@ -67,35 +67,42 @@ jobs:
with: with:
ref: v${{ steps.check.outputs.version }} ref: v${{ steps.check.outputs.version }}
path: secondary-umbrella path: secondary-umbrella
- name: CONFIGURE OTP & ELIXIR
if: env.exists != 'true'
uses: erlef/setup-beam@v1.17
with:
otp-version: ${{ steps.check.outputs.otp_version }}
elixir-version: 1.15
hexpm-mirrors: |
https://builds.hex.pm
https://cdn.jsdelivr.net/hex
- name: AUTHENTICATE TO GOOGLE CLOUD
uses: google-github-actions/auth@v2.1.3
with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: BUILD SECONDARY UMBRELLA ARCHIVE - name: BUILD SECONDARY UMBRELLA ARCHIVE
if: env.exists != 'true' if: env.exists != 'true'
working-directory: secondary-umbrella working-directory: secondary-umbrella
run: | run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }} build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
build --google_default_credentials
build --remote_download_toplevel
EOF EOF
fi fi
cat << EOF >> user.bazelrc
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-secondary-umbrella
build:buildbuddy --color=yes
build:buildbuddy --remote_download_toplevel
EOF
sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
bazelisk build :package-generic-unix \ bazelisk build :package-generic-unix \
--config=rbe-${{ steps.check.outputs.otp_version_id }} \
--test_build \ --test_build \
--verbose_failures --verbose_failures
OUTPUT_DIR=${{ github.workspace }}/output OUTPUT_DIR=${{ github.workspace }}/output
mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }} mkdir -p ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}
cp \ cp \
bazel-bin/package-generic-unix.tar.xz \ bazel-bin/package-generic-unix.tar.xz \
${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz ${OUTPUT_DIR}/${{ steps.check.outputs.otp_version }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
- name: UPLOAD THE ARCHIVE TO S3 - name: UPLOAD THE ARCHIVE TO S3
if: env.exists != 'true' if: env.exists != 'true'
uses: jakejarvis/s3-sync-action@v0.5.1 uses: jakejarvis/s3-sync-action@v0.5.1

22
.github/workflows/test-selenium.yaml vendored
View File

@ -49,24 +49,32 @@ jobs:
with: with:
otp-version: ${{ matrix.erlang_version }} otp-version: ${{ matrix.erlang_version }}
elixir-version: ${{ matrix.elixir_version }} elixir-version: ${{ matrix.elixir_version }}
hexpm-mirrors: |
https://builds.hex.pm
https://cdn.jsdelivr.net/hex
- name: Authenticate To Google Cloud
uses: google-github-actions/auth@v2.1.3
with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: Configure Bazel - name: Configure Bazel
run: | run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }} build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
build --google_default_credentials
build --remote_download_toplevel
EOF EOF
fi fi
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --build_metadata=ROLE=CI build --color=yes
build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
build:buildbuddy --color=yes
EOF EOF
- name: Build & Load RabbitMQ OCI - name: Build & Load RabbitMQ OCI
run: | run: |
bazelisk run packaging/docker-image:rabbitmq-amd64 \ bazelisk run packaging/docker-image:rabbitmq-amd64
--config=buildbuddy
- name: Configure Docker Network - name: Configure Docker Network
run: | run: |

16
.github/workflows/test-windows.yaml vendored
View File

@ -31,25 +31,17 @@ jobs:
id: configure id: configure
shell: bash shell: bash
run: | run: |
if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }} build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
build --google_default_credentials
EOF EOF
fi fi
cat << EOF >> user.bazelrc cat << EOF >> user.bazelrc
startup --output_user_root=C:/tmp startup --output_user_root=C:/tmp
startup --windows_enable_symlinks startup --windows_enable_symlinks
build --enable_runfiles build --enable_runfiles
build --color=yes
build:buildbuddy --build_metadata=ROLE=CI
build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-windows
# build:buildbuddy --repository_cache=/home/runner/repo-cache/
build:buildbuddy --color=yes
build:buildbuddy --disk_cache=
build:buildbuddy --noexperimental_remote_cache_compression
build:buildbuddy --noexperimental_remote_cache_async
build:buildbuddy --remote_build_event_upload=all
EOF EOF
bazelisk info release bazelisk info release

8
bazel/bzlmod/secondary_umbrella.bzl
View File

@ -31,6 +31,14 @@ def secondary_umbrella():
strip_prefix = "rabbitmq_server-3.11.18", strip_prefix = "rabbitmq_server-3.11.18",
# This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow. # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
urls = [ urls = [
<<<<<<< HEAD
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz", "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
=======
<<<<<<< HEAD
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_3/package-generic-unix-for-mixed-version-testing-v3.12.6.tar.xz",
=======
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/26.1/package-generic-unix-for-mixed-version-testing-v3.13.1.tar.xz",
>>>>>>> a2709dfd05 (Remove remaining buildbuddy usage)
>>>>>>> b38dc84db5 (Remove remaining buildbuddy usage)
], ],
) )

3
user-template.bazelrc
View File

@ -6,12 +6,9 @@ build --strategy=TestRunner=local
# --experimental_strict_action_env breaks memory size detection on macOS, # --experimental_strict_action_env breaks memory size detection on macOS,
# so turn it off for local runs # so turn it off for local runs
build --noexperimental_strict_action_env build --noexperimental_strict_action_env
build:buildbuddy --experimental_strict_action_env
# don't re-run flakes automatically on the local machine # don't re-run flakes automatically on the local machine
build --flaky_test_attempts=1 build --flaky_test_attempts=1
# write common test logs to logs/ dir # write common test logs to logs/ dir
build --@rules_erlang//:ct_logdir=/absolute/expanded/path/to/this/repo/logs build --@rules_erlang//:ct_logdir=/absolute/expanded/path/to/this/repo/logs
build:buildbuddy --remote_header=x-buildbuddy-api-key=YOUR_API_KEY