From 551dc707f104459a6731837ce6482b7c0234b249 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Mon, 24 May 2021 13:27:03 +0200 Subject: [PATCH] slack invite, travis docker passwords --- .travis.yml | 2 +- README.md | 2 +- test/test_restconf_internal_usecases.sh | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63d88fd9..11e46db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: script: ./configure --with-restconf=fcgi && make && sudo make install && make test before_script: - sudo apt-get install -y libfcgi-dev - - echo "hepp%7835" | docker login -u "olofhagsand" --password-stdin + - echo "$DOCKERPASSWD" | docker login -u "$DOCKERUSER" --password-stdin - ./test/travis/before_script.sh diff --git a/README.md b/README.md index 2ccc87b1..c1c50637 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,6 @@ Latest release is 5.1.0. See [CHANGELOG.md](CHANGELOG.md) release history. Clixon interaction is best done posting issues, pull requests, or joining the [slack channel](https://clixondev.slack.com). -[Slack invite](https://join.slack.com/t/clixondev/shared_invite/zt-o8lv7ysk-vcLb7yY9S7XMEklqqVBziQ) (updated 24/3 2021) +[Slack invite](https://join.slack.com/t/clixondev/shared_invite/zt-qk66zp47-ahdOlEHKEPmb~5ciVJilPQ) (updated 24/5 2021) Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/) diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh index af5c3ca0..c0afa16e 100755 --- a/test/test_restconf_internal_usecases.sh +++ b/test/test_restconf_internal_usecases.sh @@ -195,13 +195,14 @@ ps aux|grep clixon_ # XXX new "Check $pid1 exists" # Here backend dies / is killed #while sudo kill -0 $pid1 2> /dev/null; do -while sudo kill -0 $pid1; do # XXX +if sudo kill -0 $pid1; then # XXX new "kill $pid1 externally" sudo kill $pid1 sleep 1 # There is a race condition here when restconf is killed while waiting for reply from backend echo "pid1:$pid1" # XXX ps aux|grep clixon_ # XXX -done +fi +#done echo "pid1:$pid1" # XXX ps aux|grep clixon_ # XXX