Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .github/workflows/test-management-ui-for-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
cd ${SELENIUM_DIR}
docker build -t mocha-test --target test .
- name: Run short ui suites on a standalone rabbitmq server
- name: Run short UI suites on a standalone rabbitmq server
run: |
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
Expand All @@ -71,12 +71,3 @@ jobs:
name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
path: |
/tmp/short-suite
summary-selenium:
needs:
- selenium
runs-on: ubuntu-latest
steps:
- name: SUMMARY
run: |
echo "SUCCESS"
22 changes: 5 additions & 17 deletions .github/workflows/test-management-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ on:
push:
branches:
- main
- v4.0.x
- bump-otp-for-oci
- bump-rbe-*
- bump-rules_erlang
- 'v4.*.x'
paths:
- 'deps/rabbitmq_management/src/**'
- 'deps/rabbitmq_management/priv/**'
Expand Down Expand Up @@ -71,13 +68,13 @@ jobs:
cd ${SELENIUM_DIR}
docker build -t mocha-test --target test .

- name: Run short ui suite on a 3-node rabbitmq cluster
- name: Run full UI suite on a 3-node rabbitmq cluster
run: |
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
mkdir -p /tmp/short-suite
mv /tmp/selenium/* /tmp/short-suite
${SELENIUM_DIR}/run-suites.sh full-suite-management-ui
mkdir -p /tmp/full-suite
mv /tmp/selenium/* /tmp/full-suite

- name: Upload Test Artifacts
if: always()
Expand All @@ -87,12 +84,3 @@ jobs:
path: |
/tmp/full-suite
/tmp/short-suite

summary-selenium:
needs:
- selenium
runs-on: ubuntu-latest
steps:
- name: SUMMARY
run: |
echo "SUCCESS"
14 changes: 14 additions & 0 deletions selenium/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,20 @@ cd deps/rabbitmq_management/selenium
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq suites/authnz-mgt/oauth-with-uaa-with-mgt-prefix.sh
```

To customise the Selenium docker image, use the env variable `SELENIUM_DOCKER_IMAGE`:

```
cd deps/rabbitmq_management/selenium
SELENIUM_DOCKER_IMAGE=tds-rabbitmq-docker-virtual.usw1.packages.broadcom.com/selenium/standalone-chromium:133.0 ./suites/authnz-mgt/basic-auth.sh
```

To customise the temporary directory for test configuration and intermediate container configuration, use `CONF_DIR_PREFIX`. This
variable defaults to `/tmp`.

```
cd deps/rabbitmq_management/selenium
CONF_DIR_PREFIX="$PWD/temp" ./suites/authnz-mgt/basic-auth.sh
```

## Run tests interactively using your local chrome browser

Expand Down
5 changes: 2 additions & 3 deletions selenium/bin/components/rabbitmq
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ start_docker_rabbitmq() {
init_rabbitmq
kill_container_if_exist rabbitmq

mkdir -p $CONF_DIR/rabbitmq
mkdir -pv $CONF_DIR/rabbitmq/conf.d/

RABBITMQ_TEST_DIR="/var/rabbitmq" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/rabbitmq.conf
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: $CONF_DIR/rabbitmq/rabbitmq.conf"
Expand All @@ -161,13 +161,12 @@ start_docker_rabbitmq() {
fi
fi
if [ -f ${RABBITMQ_CONFIG_DIR}/logging.conf ]; then
mkdir -p $CONF_DIR/rabbitmq/conf.d/
cp ${RABBITMQ_CONFIG_DIR}/logging.conf $CONF_DIR/rabbitmq/conf.d/
fi
if [ -f ${RABBITMQ_CONFIG_DIR}/enabled_plugins ]; then
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins $CONF_DIR/rabbitmq
fi
if [ -d "${RABBITMQ_CONFIG_DIR}/certs" ]; then
if [ -d "${RABBITMQ_CONFIG_DIR}/certs" ]; then
cp -r ${RABBITMQ_CONFIG_DIR}/certs $CONF_DIR/rabbitmq
fi
if [ -d ${RABBITMQ_CONFIG_DIR}/imports ]; then
Expand Down
9 changes: 3 additions & 6 deletions selenium/bin/components/selenium
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/env bash

arch=$(uname -a)
if [[ $arch == arm* ]]; then
SELENIUM_DOCKER_IMAGE=selenium/standalone-chrome:123.0
else
SELENIUM_DOCKER_IMAGE=seleniarm/standalone-chromium:123.0
fi
# selenium/standalone-chromium is multi-arch
# https://hub.docker.com/r/selenium/standalone-chromium/tags
SELENIUM_DOCKER_IMAGE=${SELENIUM_DOCKER_IMAGE:-selenium/standalone-chromium:133.0}

start_selenium() {
begin "Starting selenium ..."
Expand Down
2 changes: 1 addition & 1 deletion selenium/bin/suite_template
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SELENIUM_ROOT_FOLDER=$(find_selenium_dir $SCRIPT)
TEST_DIR=$SELENIUM_ROOT_FOLDER/test
BIN_DIR=$SELENIUM_ROOT_FOLDER/bin
SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
CONF_DIR=/tmp/selenium/${SUITE}
CONF_DIR=${CONF_DIR_PREFIX:-/tmp}/selenium/${SUITE}
LOGS=${CONF_DIR}/logs
ENV_FILE=$CONF_DIR/.env

Expand Down