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.

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

Revamp ScienceMesh integration tests #4246

Merged
merged 35 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b2f1629
Minor clarifications
glpatcern Oct 9, 2023
78d3137
Incorporated WOPI in dockerized sciencemesh testing
glpatcern Oct 9, 2023
866804c
Added new example to run ScienceMesh integration tests against cernbo…
glpatcern Oct 9, 2023
d20c48b
Cleaned up spurious paths
glpatcern Oct 9, 2023
2881fec
Prepared certs for the new containers
glpatcern Oct 9, 2023
ebebaa4
Mock meshdir includes cernbox
glpatcern Oct 10, 2023
77a17fa
Reworked wiring of reva (sm and cernbox flavours) and wopi servers + …
glpatcern Oct 10, 2023
05119d6
Added cernbox scenarios
glpatcern Oct 10, 2023
f79feb0
Changelog
glpatcern Oct 11, 2023
1f03c7a
Fixes
glpatcern Oct 11, 2023
51e2158
Linting
glpatcern Oct 12, 2023
2f1b7bc
Removed self-signed certs, they are generated at init time
glpatcern Oct 13, 2023
523884b
Fixed references to cert files
glpatcern Oct 13, 2023
af05b18
Further tweak the wopi config for OC/NC
glpatcern Oct 13, 2023
f8faa55
Fixed Collabora config
glpatcern Oct 13, 2023
38aaefa
Moved to scripts
glpatcern Oct 13, 2023
eee3dac
Executables
glpatcern Oct 13, 2023
10b9ad3
Use dedicated TLS folders also for reva
glpatcern Oct 13, 2023
4ae0a5e
Fixes
glpatcern Oct 13, 2023
3992e5a
Use trace-level debug for tests
glpatcern Oct 17, 2023
9727d92
Wired in nginx and keycloak for CERNBox to serve the OCIS web UI
glpatcern Oct 19, 2023
45ac69a
Keycloak served through https
glpatcern Oct 23, 2023
e7005f0
CA self-signed cert back in git
glpatcern Oct 23, 2023
f2b5553
cernbox web extensions are temporarily served from a custom tgz
glpatcern Oct 23, 2023
9de66e7
Minor change
glpatcern Oct 26, 2023
5af881b
Another minor change
glpatcern Oct 26, 2023
d309448
Updated following service rename in upstream master
glpatcern Oct 26, 2023
660a505
Also copy the browser CA DB to a scratch area as it is modified by fi…
glpatcern Oct 26, 2023
b097563
Updated tutorial
glpatcern Oct 26, 2023
9f6578f
git-ignore all testing artifacts
glpatcern Oct 27, 2023
8111ae8
Fixed example
glpatcern Oct 27, 2023
8c4b1b8
Fixed cert for mock meshdir
glpatcern Oct 27, 2023
87487bc
Serve datagateway with the hostname for the cert to match
glpatcern Oct 27, 2023
942e037
Cleaner struct to parse JSON payload from PHP SM app
glpatcern Oct 31, 2023
2a51939
Prepared config for serving cernbox web from reva
glpatcern Oct 31, 2023
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ docs/tech-doc-hugo

dist/
bin/
vendor/

# API acceptance tests
tests/acceptance/output
Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/sm-config-wopi.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: revamp ScienceMesh integration tests

This extends the ScienceMesh tests by running a wopiserver next
to each EFSS/IOP, and by including a CERNBox-like minimal configuration.
The latter is based on local storage and in-memory shares (no db dependency).

https://github.com/cs3org/reva/pull/4246
45 changes: 4 additions & 41 deletions docs/content/en/docs/tutorials/wopi-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ git clone https://github.com/cs3org/reva
```

## 2. Configure Reva
Add `disable_tus = true` under `[http.services.dataprovider]` and under `[grpc.services.storageprovider]` in the file `ocmd-server-1.toml`.
Add `disable_tus = true` under `[http.services.dataprovider]` and under `[grpc.services.storageprovider]` in the file `server-1.toml`.

## 3. Build Reva
Follow the instructions in https://reva.link/docs/getting-started/install-reva/ for how to build reva. If you will do local
Expand All @@ -41,51 +41,14 @@ Now you need to run Revad (the Reva daemon). Follow these steps
from the *reva* folder:

```
cd examples/ocm/ && ../../cmd/revad/revad -c ocmd-server-1.toml & ../../cmd/revad/revad -c ocmd-server-2.toml &.
cd examples/ocm/ && ../../cmd/revad/revad -c server-1.toml & ../../cmd/revad/revad -c server-2.toml &.
```

The Reva daemon (revad) should now be running.

## 5. Configure the wopiserver
Follow the instructions in the readme for running the server locally ("Run the WOPI server locally", https://github.com/cs3org/wopiserver). You will need to do come changes in the config file, here is a more relevant example of a wopi config when runnning the server together with reva:

```
#
# wopiserver.conf - basic working configuration for a docker image
#

[general]
storagetype = cs3
port = 8880
allowedclients = localhost
oosurl = https://oos.web.cern.ch
codeurl = https://collabora.cern.ch:9980/byoa/collabora
codimdurl = http://cbox-wopidev-01.cern.ch:8000
tokenvalidity = 86400

wopiurl = localhost:8880
downloadurl = localhost:8880/wopi/cbox/download

# Logging level. Debug enables the Flask debug mode as well.
# Valid values are: Debug, Info, Warning, Error.
loglevel = Debug

[security]
usehttps = no

# location of the secret files. Requires a restart of the
# WOPI server when either the files or their content change.
wopisecretfile = /etc/wopi/wopisecret
iopsecretfile = /etc/wopi/iopsecret

[cs3]
revahost = localhost:19000
authtokenvalidity = 3600

[io]
# Size used for buffered xroot reads [bytes]
chunksize = 4194304
```
Follow the instructions in the readme for running the server locally ("Run the WOPI server locally", https://github.com/cs3org/wopiserver).
You will need to do some changes in the config file, but you can start from this [reference configuration](https://github.com/cs3org/wopiserver/blob/master/docker/etc/wopiserver.cs3.conf).

## 6. Run wopiserver
Run according to instructions in the readme ("Run the WOPI server locally", https://github.com/cs3org/wopiserver).
Expand Down
Binary file not shown.
Loading