Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest crossbar base Docker image #305

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update to latest crossbar base Docker image #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4359a26
Update to latest crossbar base Docker image
BrianJKoopman Nov 11, 2022
48ce2fd
tests: Give agents more time to reconnect
BrianJKoopman Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docker/crossbar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
# https://crossbar.io/docs/Creating-Docker-Images/

# Use ocs base image
FROM crossbario/crossbar:cpy3-20.8.1
FROM crossbario/crossbar:cpy-slim-amd64-22.6.1

# Run as root to put config in place and chown
USER root

# Create crossbar user/group
RUN groupadd -g 242 crossbar && \
useradd -r -l -u 242 -g 242 crossbar

# Copy in config and requirements files
COPY config.json /ocs/.crossbar/config.json
RUN chown -R crossbar:crossbar /ocs
Expand Down
2 changes: 1 addition & 1 deletion docker/crossbar/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"close_handshake_timeout": 1000,
"auto_ping_interval": 10000,
"auto_ping_timeout": 5000,
"auto_ping_size": 4
"auto_ping_size": 12
}
},
"call": {
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/test_crossbar_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ def test_fake_data_after_crossbar_restart(wait_for_crossbar):
# Set OCS_CONFIG_DIR environment variable
os.environ['OCS_CONFIG_DIR'] = os.getcwd()

# give time to reconnect
time.sleep(CROSSBAR_SLEEP)

# Check fake data Agent is accessible and producing new data.
therm_client = OCSClient('fake-data1', args=[])

Expand Down Expand Up @@ -80,6 +83,9 @@ def test_aggregator_after_crossbar_restart(wait_for_crossbar):
# restart crossbar
restart_crossbar()

# give time to reconnect
time.sleep(CROSSBAR_SLEEP)

# record current time
# now = time.time()

Expand Down