Compare commits

...

2 Commits

Author SHA1 Message Date
David Pineau 8f86d4aaa4 Fix ceph-daemon entrypoint wrapper 2019-01-29 15:30:16 +01:00
David Pineau fa4defdece Deactivate proxy for unit coverage testing 2019-01-29 12:01:17 +01:00
2 changed files with 7 additions and 1 deletions

View File

@ -157,6 +157,12 @@ stages:
- ShellCommand: - ShellCommand:
name: Unit Coverage name: Unit Coverage
command: | command: |
unset HTTP_PROXY
unset HTTPS_PROXY
unset http_proxy
unset https_proxy
unset NO_PROXY
unset no_proxy
set -ex set -ex
mkdir -p $CIRCLE_TEST_REPORTS/unit mkdir -p $CIRCLE_TEST_REPORTS/unit
npm test npm test

View File

@ -4,7 +4,7 @@ touch /artifacts/ceph.log
mkfifo /tmp/entrypoint_output mkfifo /tmp/entrypoint_output
# We run this in the background so that we can tail the RGW log after init, # We run this in the background so that we can tail the RGW log after init,
# because entrypoint.sh never returns # because entrypoint.sh never returns
bash entrypoint.sh > /tmp/entrypoint_output & bash /opt/ceph-container/bin/entrypoint.sh > /tmp/entrypoint_output &
entrypoint_pid="$!" entrypoint_pid="$!"
while read -r line; do while read -r line; do
echo $line echo $line