root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Selenium: make conf_dir configurable 

CI can configure this variable to use a dynamic variable e.g. `${{
worker.temp }}`
This commit is contained in:
Aitor Perez 2025-02-25 11:23:45 +00:00
parent 6e76defe33
commit c2b9fece78
No known key found for this signature in database
GPG Key ID: 24E81F3C627B6475
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selenium/bin/components/rabbitmq
View File

@ -147,7 +147,7 @@ start_docker_rabbitmq() {
init_rabbitmq init_rabbitmq
kill_container_if_exist 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 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" print "> EFFECTIVE RABBITMQ_CONFIG_FILE: $CONF_DIR/rabbitmq/rabbitmq.conf"
@ -161,7 +161,6 @@ start_docker_rabbitmq() {
fi fi
fi fi
if [ -f ${RABBITMQ_CONFIG_DIR}/logging.conf ]; then 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/ cp ${RABBITMQ_CONFIG_DIR}/logging.conf $CONF_DIR/rabbitmq/conf.d/
fi fi
if [ -f ${RABBITMQ_CONFIG_DIR}/enabled_plugins ]; then if [ -f ${RABBITMQ_CONFIG_DIR}/enabled_plugins ]; then

2
selenium/bin/suite_template
View File

@ -31,7 +31,7 @@ SELENIUM_ROOT_FOLDER=$(find_selenium_dir $SCRIPT)
TEST_DIR=$SELENIUM_ROOT_FOLDER/test TEST_DIR=$SELENIUM_ROOT_FOLDER/test
BIN_DIR=$SELENIUM_ROOT_FOLDER/bin BIN_DIR=$SELENIUM_ROOT_FOLDER/bin
SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE} SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
CONF_DIR=/tmp/selenium/${SUITE} CONF_DIR=${CONF_DIR_PREFIX:-/tmp}/selenium/${SUITE}
LOGS=${CONF_DIR}/logs LOGS=${CONF_DIR}/logs
ENV_FILE=$CONF_DIR/.env ENV_FILE=$CONF_DIR/.env