Skip to content

Commit 28dab44

Browse files
committed
Switch AWS peer discovery tests from Bazel to make
This change includes some fixes like setting the suffix for the metadata which is necessary since 6692fcb. The main reason for this change though is to switch from running the integration_SUITE from the AWS peer discovery plugin from Bazel to make, a necessary step to dropping the Bazel files.
1 parent 68f1b2c commit 28dab44

File tree

1 file changed

+19
-46
lines changed

1 file changed

+19
-46
lines changed

.github/workflows/peer-discovery-aws.yaml

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref_name }}
1414
cancel-in-progress: true
15+
env:
16+
OTP_VERSION: "27"
1517
jobs:
1618
peer-discovery-aws-integration-test:
1719
name: Integration Test
@@ -34,6 +36,8 @@ jobs:
3436
id: metadata
3537
with:
3638
images: pivotalrabbitmq/rabbitmq
39+
flavor: |
40+
suffix=-otp${{ env.OTP_VERSION }}
3741
tags: |
3842
type=sha,format=long
3943
- uses: int128/wait-for-docker-image-action@v1
@@ -42,23 +46,12 @@ jobs:
4246
tags: ${{ steps.metadata.outputs.tags }}
4347
timeout-seconds: 3600
4448
polling-seconds: 60
45-
- name: COMPUTE REPO CACHE KEY
46-
if: steps.authorized.outputs.authorized == 'true'
47-
id: repo-cache-key
48-
run: |
49-
echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT
50-
- name: LOAD REPO CACHE
51-
if: steps.authorized.outputs.authorized == 'true'
52-
uses: actions/cache/restore@v4
53-
with:
54-
key: ${{ steps.repo-cache-key.outputs.value }}
55-
path: /home/runner/repo-cache/
5649
- name: CONFIGURE OTP & ELIXIR
5750
if: steps.authorized.outputs.authorized == 'true'
5851
uses: erlef/[email protected]
5952
with:
60-
otp-version: 26
61-
elixir-version: 1.15
53+
otp-version: ${{ env.OTP_VERSION }}
54+
elixir-version: "1.17"
6255
- name: SETUP ecs-cli
6356
if: steps.authorized.outputs.authorized == 'true'
6457
env:
@@ -67,40 +60,20 @@ jobs:
6760
curl -Lo /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-v${ECS_CLI_VERSION} && \
6861
chmod +x /usr/local/bin/ecs-cli && \
6962
ecs-cli --version
70-
- name: AUTHENTICATE TO GOOGLE CLOUD
71-
if: steps.authorized.outputs.authorized == 'true'
72-
uses: google-github-actions/[email protected]
73-
with:
74-
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
75-
- name: CONFIGURE BAZEL
76-
if: steps.authorized.outputs.authorized == 'true'
77-
run: |
78-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
79-
cat << EOF >> user.bazelrc
80-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
81-
build --google_default_credentials
82-
83-
build --experimental_guard_against_concurrent_changes
84-
EOF
85-
fi
86-
cat << EOF >> user.bazelrc
87-
build --repository_cache=/home/runner/repo-cache/
88-
build --color=yes
89-
EOF
90-
91-
bazelisk info release
92-
#! - name: Setup tmate session
93-
#! uses: mxschmitt/action-tmate@v3
9463
- name: RUN INTEGRATION TESTS
9564
if: steps.authorized.outputs.authorized == 'true'
65+
env:
66+
AWS_ACCESS_KEY_ID: "${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }}"
67+
AWS_SECRET_ACCESS_KEY: "${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }}"
68+
RABBITMQ_IMAGE: "${{ steps.metadata.outputs.tags }}"
9669
run: |
9770
branch_or_tag="${GITHUB_REF##*/}"
98-
bazelisk test //deps/rabbitmq_peer_discovery_aws:integration_SUITE \
99-
--test_tag_filters=aws \
100-
--build_tests_only \
101-
--test_env AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \
102-
--test_env AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }} \
103-
--test_env RABBITMQ_IMAGE="pivotalrabbitmq/rabbitmq:sha-${{ github.sha }}" \
104-
--test_env AWS_ECS_CLUSTER_NAME="rabbitmq-peer-discovery-aws-actions-${branch_or_tag//[._]/-}" \
105-
--test_output=streamed \
106-
--verbose_failures
71+
export AWS_ECS_CLUSTER_NAME="rabbitmq-peer-discovery-aws-actions-${branch_or_tag//[._]/-}"
72+
make -C deps/rabbitmq_peer_discovery_aws ct-integration
73+
- name: UPLOAD TEST LOGS
74+
if: always()
75+
uses: actions/upload-artifact@v4
76+
with:
77+
name: CT logs
78+
path: "logs/"
79+
if-no-files-found: ignore

0 commit comments

Comments
 (0)