@@ -355,8 +355,8 @@ _test() {
355355 print " > FAKEPORTAL_URL: ${FAKEPORTAL_URL} "
356356 mocha_test_tag=($( md5sum $SELENIUM_ROOT_FOLDER /package.json) )
357357
358- print " > OAUTH_NODE_EXTRA_CA_CERTS: ${OAUTH_NODE_EXTRA_CA_CERTS} "
359- MOUNT_NODE_EXTRA_CA_CERTS=${TEST_DIR} / ${OAUTH_NODE_EXTRA_CA_CERTS}
358+ generate_node_extra_ca_cert
359+ MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR} /node_ca_certs.pem
360360 print " > MOUNT_NODE_EXTRA_CA_CERTS: ${MOUNT_NODE_EXTRA_CA_CERTS} "
361361
362362 docker run \
@@ -417,15 +417,15 @@ other_profiles_with_local_or_docker() {
417417 fi
418418}
419419generate_env_file () {
420- begin " Generating env file from profiles ${PROFILES} ..."
420+ begin " Generating env file from profiles: [ ${PROFILES} ] ..."
421421 mkdir -p $CONF_DIR
422422 ${BIN_DIR} /gen-env-file " ${PROFILES} " $TEST_CONFIG_DIR ${ENV_FILE} .tmp
423423 grep -v ' ^#' ${ENV_FILE} .tmp > $ENV_FILE
424424 source $ENV_FILE
425425 end " Finished generating env file."
426426}
427427generate_other_env_file () {
428- begin " Generating other env file from profiles ${PROFILES_FOR_OTHER} "
428+ begin " Generating other env file from profiles: [ ${PROFILES_FOR_OTHER} ] "
429429 mkdir -p $CONF_DIR
430430 ${BIN_DIR} /gen-env-file " ${PROFILES_FOR_OTHER} " $TEST_CONFIG_DIR ${OTHER_ENV_FILE} .tmp
431431 grep -v ' ^#' ${OTHER_ENV_FILE} .tmp > $OTHER_ENV_FILE
@@ -674,7 +674,7 @@ test_local() {
674674 export SELENIUM_POLLING=${SELENIUM_POLLING:- 500}
675675
676676 generate_node_extra_ca_cert
677- MOUNT_NODE_EXTRA_CA_CERTS=${RABBITMQ_CERTS } /node_ca_certs.pem
677+ MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR } /node_ca_certs.pem
678678
679679 print " > SELENIUM_TIMEOUT: ${SELENIUM_TIMEOUT} "
680680 print " > SELENIUM_POLLING: ${SELENIUM_POLLING} "
@@ -738,14 +738,16 @@ save_components_logs() {
738738 end " Finished saving logs"
739739}
740740generate_node_extra_ca_cert () {
741- echo " Generating $RABBITMQ_CERTS /node_ca_certs.pem ..."
742- rm -f $RABBITMQ_CERTS /node_ca_certs.pem
741+ echo " Generating ${CONF_DIR} /node_ca_certs.pem ..."
742+ rm -f ${CONF_DIR} /node_ca_certs.pem
743743 env | while IFS= read -r line; do
744744 value=${line#* =}
745745 name=${line%% =* }
746+
746747 if [[ $name == * NODE_EXTRA_CA_CERTS ]]
747748 then
748- cat ${TEST_DIR} /${value} >> $RABBITMQ_CERTS /node_ca_certs.pem
749+ echo " Adding ${TEST_DIR} /${value} to ${CONF_DIR} /node_ca_certs.pem ..."
750+ cat ${TEST_DIR} /${value} >> ${CONF_DIR} /node_ca_certs.pem
749751 fi
750752 done
751753}
0 commit comments