Skip to content

Commit d98eb17

Browse files
Move also selenium authz tests to Makefile
1 parent e1e101d commit d98eb17

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

.github/workflows/test-authnz.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,10 @@ jobs:
6262
with:
6363
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
6464

65-
- name: Configure Bazel
66-
run: |
67-
if [ -n "${{ secrets.REMOTE_CACHE_BUCKET_NAME }}" ]; then
68-
cat << EOF >> user.bazelrc
69-
build --remote_cache=https://storage.googleapis.com/${{ secrets.REMOTE_CACHE_BUCKET_NAME }}
70-
build --google_default_credentials
71-
72-
build --remote_download_toplevel
73-
EOF
74-
fi
75-
cat << EOF >> user.bazelrc
76-
build --color=yes
77-
EOF
78-
7965
- name: Build & Load RabbitMQ OCI
8066
run: |
81-
bazelisk run packaging/docker-image:rabbitmq-amd64
67+
make package-generic-unix
68+
make docker-image
8269
8370
- name: Configure Docker Network
8471
run: |
@@ -91,7 +78,8 @@ jobs:
9178
9279
- name: Run Suites
9380
run: |
94-
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
81+
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
82+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
9583
${SELENIUM_DIR}/run-suites.sh full-suite-authnz-messaging
9684
9785
- name: Upload Test Artifacts

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ jobs:
5959
- name: Run full ui suites on a standalone rabbitmq server
6060
run: |
6161
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
62+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
63+
${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
6364
mkdir -p /tmp/full-suite
6465
mv /tmp/selenium/* /tmp/full-suite
6566
mkdir -p /tmp/full-suite/logs

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ jobs:
7373
- name: Run short ui suite on a 3-node rabbitmq cluster
7474
run: |
7575
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
76+
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
77+
${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
7778
mkdir -p /tmp/short-suite
7879
mv /tmp/selenium/* /tmp/short-suite
7980
mkdir -p /tmp/short-suite/logs

0 commit comments

Comments
 (0)