Skip to content

Commit 9338b1b

Browse files
Run selenium job with Makefile
1 parent 348924e commit 9338b1b

File tree

2 files changed

+9
-35
lines changed

2 files changed

+9
-35
lines changed

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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,8 +58,8 @@ jobs:
7158
7259
- name: Run full ui suites on a standalone rabbitmq server
7360
run: |
74-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
75-
${SELENIUM_DIR}/run-suites.sh
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 ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
7663
mkdir -p /tmp/full-suite
7764
mv /tmp/selenium/* /tmp/full-suite
7865
mkdir -p /tmp/full-suite/logs

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,10 @@ jobs:
5656
with:
5757
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
5858

59-
- name: Configure Bazel
60-
run: |
61-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
62-
cat << EOF >> user.bazelrc
63-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
64-
build --google_default_credentials
65-
66-
build --remote_download_toplevel
67-
EOF
68-
fi
69-
cat << EOF >> user.bazelrc
70-
build --color=yes
71-
EOF
72-
7359
- name: Build & Load RabbitMQ OCI
7460
run: |
75-
bazelisk run packaging/docker-image:rabbitmq-amd64
61+
make package-generic-unix
62+
make docker-image
7663
7764
- name: Configure Docker Network
7865
run: |
@@ -84,9 +71,9 @@ jobs:
8471
docker build -t mocha-test --target test .
8572
8673
- name: Run short ui suite on a 3-node rabbitmq cluster
87-
run: |
88-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
89-
ADDON_PROFILES=cluster ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
74+
run: |
75+
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
76+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq-$IMAGE_TAG ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
9077
mkdir -p /tmp/short-suite
9178
mv /tmp/selenium/* /tmp/short-suite
9279
mkdir -p /tmp/short-suite/logs

0 commit comments

Comments
 (0)