Skip to content

Commit bd1176f

Browse files
Merge pull request #12964 from rabbitmq/use-make-to-run-selenium-in-v4.0.x
Use make to run selenium in v4.0.x
2 parents 13cf192 + b3c4d57 commit bd1176f

File tree

4 files changed

+26
-81
lines changed

4 files changed

+26
-81
lines changed

.github/workflows/test-authnz.yaml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@ on:
1111
- 'deps/rabbitmq_management/src/**'
1212
- 'deps/rabbitmq_management/priv/**'
1313
- 'selenium/**'
14-
- 'scripts/**'
15-
- .bazelrc
16-
- .bazelversion
17-
- BUILD.*
18-
- '*.bzl'
19-
- '*.bazel'
14+
- 'scripts/**'
2015
- .github/workflows/test-authnz.yaml
2116
pull_request:
2217
paths:
18+
- 'selenium/**'
2319
- 'deps/rabbit/**'
2420
- 'deps/rabbitmq_auth_/**'
2521
- 'deps/rabbitmq_mqtt/**'
26-
- 'selenium/full-suite-authnz-messaging'
27-
- 'selenium/suites/authnz-messaging'
2822
- 'selenium/test/authnz-msg-protocols'
29-
- .github/workflows/test-authnz.yaml
23+
- '.github/workflows/test-authnz.yaml'
3024
concurrency:
3125
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
3226
cancel-in-progress: true
@@ -63,24 +57,11 @@ jobs:
6357
uses: google-github-actions/[email protected]
6458
with:
6559
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
66-
67-
- name: Configure Bazel
68-
run: |
69-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
70-
cat << EOF >> user.bazelrc
71-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
72-
build --google_default_credentials
73-
74-
build --remote_download_toplevel
75-
EOF
76-
fi
77-
cat << EOF >> user.bazelrc
78-
build --color=yes
79-
EOF
80-
60+
8161
- name: Build & Load RabbitMQ OCI
8262
run: |
83-
bazelisk run packaging/docker-image:rabbitmq-amd64
63+
make package-generic-unix
64+
make docker-image
8465
8566
- name: Configure Docker Network
8667
run: |
@@ -93,8 +74,11 @@ jobs:
9374
9475
- name: Run Suites
9576
run: |
96-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
77+
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
78+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
9779
${SELENIUM_DIR}/run-suites.sh full-suite-authnz-messaging
80+
mkdir -p /tmp/full-suite-authnz-messaging
81+
mv /tmp/selenium/* /tmp/full-suite-authnz-messaging
9882
9983
- name: Upload Test Artifacts
10084
if: always()

.github/workflows/test-make-target.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ jobs:
7575
run: |
7676
sudo apt-get update && \
7777
sudo apt-get install -y \
78-
apparmor-utils \
7978
ldap-utils \
8079
slapd
8180
82-
sudo aa-complain `which slapd`
8381
8482
- name: RUN TESTS
8583
if: inputs.plugin != 'rabbitmq_cli'

.github/workflows/test-management-ui-for-pr.yaml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
paths:
55
- 'deps/**'
66
- 'selenium/**'
7-
- .github/workflows/test-management-ui-for-pr.yaml
7+
- '.github/workflows/test-management-ui-for-pr.yaml'
88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1010
cancel-in-progress: true
@@ -42,23 +42,10 @@ jobs:
4242
with:
4343
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
4444

45-
- name: Configure Bazel
46-
run: |
47-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
48-
cat << EOF >> user.bazelrc
49-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
50-
build --google_default_credentials
51-
52-
build --remote_download_toplevel
53-
EOF
54-
fi
55-
cat << EOF >> user.bazelrc
56-
build --color=yes
57-
EOF
58-
5945
- name: Build & Load RabbitMQ OCI
6046
run: |
61-
bazelisk run packaging/docker-image:rabbitmq-amd64
47+
make package-generic-unix
48+
make docker-image
6249
6350
- name: Configure Docker Network
6451
run: |
@@ -71,14 +58,11 @@ jobs:
7158
7259
- name: Run short ui suites on a standalone rabbitmq server
7360
run: |
74-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
75-
ADDON_PROFILES=cluster ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
61+
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
62+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
63+
${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
7664
mkdir -p /tmp/short-suite
7765
mv /tmp/selenium/* /tmp/short-suite
78-
mkdir -p /tmp/short-suite/logs
79-
mv ${SELENIUM_DIR}/logs/* /tmp/short-suite/logs
80-
mkdir -p /tmp/short-suite/screens
81-
mv ${SELENIUM_DIR}/screens/* /tmp/short-suite/screens
8266
8367
- name: Upload Test Artifacts
8468
if: always()

.github/workflows/test-management-ui.yaml

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@ on:
1111
- 'deps/rabbitmq_management/src/**'
1212
- 'deps/rabbitmq_management/priv/**'
1313
- 'deps/rabbitmq_web_dispatch/src/**'
14-
- 'scripts/**'
15-
- .bazelrc
16-
- .bazelversion
17-
- BUILD.*
18-
- '*.bzl'
19-
- '*.bazel'
14+
- 'scripts/**'
2015
- 'selenium/**'
21-
- .github/workflows/test-management-ui.yaml
16+
- '.github/workflows/test-management-ui.yaml'
2217

2318
concurrency:
2419
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -57,23 +52,10 @@ jobs:
5752
with:
5853
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
5954

60-
- name: Configure Bazel
55+
- name: Build & Load RabbitMQ OCI
6156
run: |
62-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
63-
cat << EOF >> user.bazelrc
64-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
65-
build --google_default_credentials
66-
67-
build --remote_download_toplevel
68-
EOF
69-
fi
70-
cat << EOF >> user.bazelrc
71-
build --color=yes
72-
EOF
73-
74-
- name: Build & Load RabbitMQ OCI
75-
run: |
76-
bazelisk run packaging/docker-image:rabbitmq-amd64
57+
make package-generic-unix
58+
make docker-image
7759
7860
- name: Configure Docker Network
7961
run: |
@@ -86,22 +68,19 @@ jobs:
8668
8769
- name: Run short ui suite on a 3-node rabbitmq cluster
8870
run: |
89-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
90-
ADDON_PROFILES=cluster ${SELENIUM_DIR}/run-suites.sh full-suite-management-ui
71+
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
72+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
73+
${SELENIUM_DIR}/run-suites.sh full-suite-management-ui
9174
mkdir -p /tmp/full-suite
9275
mv /tmp/selenium/* /tmp/full-suite
93-
mkdir -p /tmp/full-suite/logs
94-
mv ${SELENIUM_DIR}/logs/* /tmp/full-suite/logs
95-
mkdir -p /tmp/full-suite/screens
96-
mv ${SELENIUM_DIR}/screens/* /tmp/full-suite/screens
97-
76+
9877
- name: Upload Test Artifacts
9978
if: always()
10079
uses: actions/[email protected]
10180
with:
10281
name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
10382
path: |
104-
/tmp/short-suite
83+
/tmp/full-suite
10584
10685
summary-selenium:
10786
needs:

0 commit comments

Comments
 (0)