Skip to content

Commit 9f336b9

Browse files
authored
Merge pull request #13420 from rabbitmq/ci/update-selenium
Update management UI workflows
2 parents 6e76def + a5b8d19 commit 9f336b9

File tree

6 files changed

+26
-37
lines changed

6 files changed

+26
-37
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
cd ${SELENIUM_DIR}
5757
docker build -t mocha-test --target test .
5858
59-
- name: Run short ui suites on a standalone rabbitmq server
59+
- name: Run short 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}')
6262
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
@@ -71,12 +71,3 @@ jobs:
7171
name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
7272
path: |
7373
/tmp/short-suite
74-
75-
summary-selenium:
76-
needs:
77-
- selenium
78-
runs-on: ubuntu-latest
79-
steps:
80-
- name: SUMMARY
81-
run: |
82-
echo "SUCCESS"

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- v4.0.x
7-
- bump-otp-for-oci
8-
- bump-rbe-*
9-
- bump-rules_erlang
6+
- 'v4.*.x'
107
paths:
118
- 'deps/rabbitmq_management/src/**'
129
- 'deps/rabbitmq_management/priv/**'
@@ -71,13 +68,13 @@ jobs:
7168
cd ${SELENIUM_DIR}
7269
docker build -t mocha-test --target test .
7370
74-
- name: Run short ui suite on a 3-node rabbitmq cluster
71+
- name: Run full UI suite on a 3-node rabbitmq cluster
7572
run: |
7673
IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
7774
RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
78-
${SELENIUM_DIR}/run-suites.sh short-suite-management-ui
79-
mkdir -p /tmp/short-suite
80-
mv /tmp/selenium/* /tmp/short-suite
75+
${SELENIUM_DIR}/run-suites.sh full-suite-management-ui
76+
mkdir -p /tmp/full-suite
77+
mv /tmp/selenium/* /tmp/full-suite
8178
8279
- name: Upload Test Artifacts
8380
if: always()
@@ -87,12 +84,3 @@ jobs:
8784
path: |
8885
/tmp/full-suite
8986
/tmp/short-suite
90-
91-
summary-selenium:
92-
needs:
93-
- selenium
94-
runs-on: ubuntu-latest
95-
steps:
96-
- name: SUMMARY
97-
run: |
98-
echo "SUCCESS"

selenium/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,20 @@ cd deps/rabbitmq_management/selenium
116116
RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq suites/authnz-mgt/oauth-with-uaa-with-mgt-prefix.sh
117117
```
118118

119+
To customise the Selenium docker image, use the env variable `SELENIUM_DOCKER_IMAGE`:
120+
121+
```
122+
cd deps/rabbitmq_management/selenium
123+
SELENIUM_DOCKER_IMAGE=tds-rabbitmq-docker-virtual.usw1.packages.broadcom.com/selenium/standalone-chromium:133.0 ./suites/authnz-mgt/basic-auth.sh
124+
```
125+
126+
To customise the temporary directory for test configuration and intermediate container configuration, use `CONF_DIR_PREFIX`. This
127+
variable defaults to `/tmp`.
128+
129+
```
130+
cd deps/rabbitmq_management/selenium
131+
CONF_DIR_PREFIX="$PWD/temp" ./suites/authnz-mgt/basic-auth.sh
132+
```
119133

120134
## Run tests interactively using your local chrome browser
121135

selenium/bin/components/rabbitmq

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ start_docker_rabbitmq() {
147147
init_rabbitmq
148148
kill_container_if_exist rabbitmq
149149

150-
mkdir -p $CONF_DIR/rabbitmq
150+
mkdir -pv $CONF_DIR/rabbitmq/conf.d/
151151

152152
RABBITMQ_TEST_DIR="/var/rabbitmq" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/rabbitmq.conf
153153
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: $CONF_DIR/rabbitmq/rabbitmq.conf"
@@ -161,13 +161,12 @@ start_docker_rabbitmq() {
161161
fi
162162
fi
163163
if [ -f ${RABBITMQ_CONFIG_DIR}/logging.conf ]; then
164-
mkdir -p $CONF_DIR/rabbitmq/conf.d/
165164
cp ${RABBITMQ_CONFIG_DIR}/logging.conf $CONF_DIR/rabbitmq/conf.d/
166165
fi
167166
if [ -f ${RABBITMQ_CONFIG_DIR}/enabled_plugins ]; then
168167
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins $CONF_DIR/rabbitmq
169168
fi
170-
if [ -d "${RABBITMQ_CONFIG_DIR}/certs" ]; then
169+
if [ -d "${RABBITMQ_CONFIG_DIR}/certs" ]; then
171170
cp -r ${RABBITMQ_CONFIG_DIR}/certs $CONF_DIR/rabbitmq
172171
fi
173172
if [ -d ${RABBITMQ_CONFIG_DIR}/imports ]; then

selenium/bin/components/selenium

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/env bash
22

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

107
start_selenium() {
118
begin "Starting selenium ..."

selenium/bin/suite_template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SELENIUM_ROOT_FOLDER=$(find_selenium_dir $SCRIPT)
3131
TEST_DIR=$SELENIUM_ROOT_FOLDER/test
3232
BIN_DIR=$SELENIUM_ROOT_FOLDER/bin
3333
SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
34-
CONF_DIR=/tmp/selenium/${SUITE}
34+
CONF_DIR=${CONF_DIR_PREFIX:-/tmp}/selenium/${SUITE}
3535
LOGS=${CONF_DIR}/logs
3636
ENV_FILE=$CONF_DIR/.env
3737

0 commit comments

Comments
 (0)