Merge pull request #3843 from owncloud/ci-test-against-latest-ocis

[Tests-Only] Run CI for Phoenix tests against latest OCIS

.drone.star

@@ -118,7 +118,7 @@ config = {
 	'defaults': {
 		'acceptance': {
 			'ocisBranch': 'master',
-			'ocisCommit': '284a9996dffa912cc1382e259b748c56ddc4aa0f',
+			'ocisCommit': 'cef578008a6e04902325c7aef619dc816ff6b82b',
 		}
 	},
 
@@ -1174,6 +1174,8 @@ def ocisService():
 			'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
 			'REVA_OIDC_ISSUER': 'https://ocis:9200',
 			'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis:9164/data',
+			'REVA_STORAGE_HOME_EXPOSE_DATA_SERVER': 1,
+			'REVA_STORAGE_OC_EXPOSE_DATA_SERVER': 1,
 			'PHOENIX_WEB_CONFIG': '/srv/config/drone/ocis-config.json',
 			'PHOENIX_ASSET_PATH': '/var/www/owncloud/phoenix/dist',
 			'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/srv/config/drone/identifier-registration.yml',

package.json

@@ -35,7 +35,7 @@
     "docker-kill": "docker kill phoenix-tests-selenium phoenix-tests-slapd phoenix-tests-redis",
     "testing-app": "if [ -d tests/testing-app ]; then (cd tests/testing-app && git pull && pwd); else git clone --depth 1 https://github.com/owncloud/testing.git tests/testing-app; fi;",
     "build-ocis": "if [ -d tests/ocis ]; then (cd tests/ocis && git reset --hard master && git pull); else git clone --depth 1 https://github.com/owncloud/ocis.git tests/ocis; fi; cd tests/ocis; make clean; make",
-    "ocis": "yarn run build-ocis; REVA_LDAP_HOSTNAME='localhost' REVA_LDAP_PORT=636 REVA_LDAP_BIND_PASSWORD='admin' REVA_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com' REVA_LDAP_BASE_DN='dc=owncloud,dc=com' REVA_STORAGE_OWNCLOUD_REDIS_ADDR='localhost:6379' PHOENIX_ASSET_PATH='./dist' LDAP_URI='ldap://localhost' LDAP_BINDDN='cn=admin,dc=owncloud,dc=com' LDAP_BINDPW='admin' LDAP_BASEDN='dc=owncloud,dc=com' tests/ocis/bin/ocis server &",
+    "ocis": "yarn run build-ocis; REVA_LDAP_HOSTNAME='localhost' REVA_LDAP_PORT=636 REVA_LDAP_BIND_PASSWORD='admin' REVA_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com' REVA_LDAP_BASE_DN='dc=owncloud,dc=com' REVA_STORAGE_OWNCLOUD_REDIS_ADDR='localhost:6379' REVA_STORAGE_HOME_EXPOSE_DATA_SERVER=1 REVA_STORAGE_OC_EXPOSE_DATA_SERVER=1 PHOENIX_ASSET_PATH='./dist' LDAP_URI='ldap://localhost' LDAP_BINDDN='cn=admin,dc=owncloud,dc=com' LDAP_BINDPW='admin' LDAP_BASEDN='dc=owncloud,dc=com' tests/ocis/bin/ocis server &",
     "ocis:mac": "yarn run build-ocis; REVA_LDAP_HOSTNAME='localhost' REVA_LDAP_PORT=636 REVA_LDAP_BIND_PASSWORD='admin' REVA_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com' REVA_LDAP_BASE_DN='dc=owncloud,dc=com' REVA_STORAGE_OWNCLOUD_REDIS_ADDR='localhost:6379' REVA_OIDC_ISSUER='https://host.docker.internal:9200' KONNECTD_IDENTIFIER_REGISTRATION_CONF='./tests/acceptance/mac-identifier-registration.yml' KONNECTD_ISS='https://host.docker.internal:9200' KONNECTD_TLS='true' PHOENIX_WEB_CONFIG='./tests/acceptance/ocis-mac-config.json' PHOENIX_ASSET_PATH='./dist' LDAP_URI='ldap://localhost' LDAP_BINDDN='cn=admin,dc=owncloud,dc=com' LDAP_BINDPW='admin' LDAP_BASEDN='dc=owncloud,dc=com' bin/ocis server &",
     "test-requirements:ocis": "yarn run ldap-server; yarn run redis-server; yarn run selenium; yarn run testing-app; yarn run ocis",
     "test-requirements:ocis:mac": "yarn run ldap-server; yarn run redis-server; yarn run selenium:mac; yarn run testing-app; yarn run ocis:mac"