fix docker-compose file

owncloud · Sep 8, 2020 · f02a95e · f02a95e
1 parent 8faff58
commit f02a95e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/.drone.star b/.drone.star
@@ -337,7 +337,7 @@ def coreApiTestsEosStorage(ctx, coreBranch = 'master', coreCommit = '', part_num
           'DIVIDE_INTO_NUM_PARTS': number_of_parts,
           'RUN_PART': part_number,
           'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-on-EOS-storage.txt',
-          'DELETE_USER_DATA_CMD': 'ssh -t root@$IPADDR docker exec -it mgm-master eos -r 0 0 rm -r /eos/dockertest/reva/users/%s',
+          'DELETE_USER_DATA_CMD': 'ssh -tt root@$IPADDR docker exec -it mgm-master eos -r 0 0 rm -r /eos/dockertest/reva/users/%s',
           'DRONE_COMMIT_ID': ctx.build.commit,
           'HCLOUD_TOKEN': {
             'from_secret': 'hcloud_token',
@@ -369,7 +369,7 @@ def coreApiTestsEosStorage(ctx, coreBranch = 'master', coreCommit = '', part_num
           'export IPADDR=$(hcloud server ip $SERVER_NAME)',
           'export TEST_SERVER_URL=https://$IPADDR:9200',
 
-          'ssh -o StrictHostKeyChecking=no root@$IPADDR',
+          'ssh -o StrictHostKeyChecking=no root@$IPADDR ls',
 
           # Create an eos machine
           'cd /drone/src',

diff --git a/docker-compose-eos-ci.yml b/docker-compose-eos-ci.yml
@@ -48,7 +48,7 @@ services:
       # the eos end xrdcopy binaries use this env var to find the eos mgm
       EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
       PHOENIX_WEB_CONFIG: /eos-config/config.json
-      KONNECTD_IDENTIFIER_REGISTRATION_CONF: /eos-config/identifier-registration.yml
+      KONNECTD_IDENTIFIER_REGISTRATION_CONF: /eos-config/identifier-registration.yaml
 
   mgm-master:
     container_name: mgm-master

diff --git a/tests/config/drone/create-identifier-registration.sh b/tests/config/drone/create-identifier-registration.sh
@@ -12,4 +12,4 @@ clients:
       - https://${OCIS_DOMAIN}:9200/
     origins:
       -  https://${OCIS_DOMAIN}:9200
-authorities:" > $PWD/identifier-registration.yml
+authorities:" > $PWD/identifier-registration.yaml
diff --git a/tests/config/drone/setup-eos.sh b/tests/config/drone/setup-eos.sh
@@ -7,17 +7,17 @@ do
     sleep 5
 done
 
-docker-compose -f ./docker-compose-eos-ci.yml exec -d ocis /start-ldap
+docker-compose exec -d ocis /start-ldap
 
 # time for ldap service to starup within ocis container
 sleep 5
 
 # Configure ocis
-docker-compose -f ./docker-compose-eos-ci.yml exec ocis id einstein
-docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-users
-docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis run reva-users
-docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-storage-home
-docker-compose -f ./docker-compose-eos-ci.yml exec -e REVA_STORAGE_HOME_DRIVER=eoshome -e REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run reva-storage-home
-docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-storage-home-data
-docker-compose -f ./docker-compose-eos-ci.yml exec -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
+docker-compose exec ocis id einstein
+docker-compose exec ocis /ocis/bin/ocis kill reva-users
+docker-compose exec ocis /ocis/bin/ocis run reva-users
+docker-compose exec ocis /ocis/bin/ocis kill reva-storage-home
+docker-compose exec -e REVA_STORAGE_HOME_DRIVER=eoshome -e REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run reva-storage-home
+docker-compose exec ocis /ocis/bin/ocis kill reva-storage-home-data
+docker-compose exec -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
 
diff --git a/tests/spawn_eos.sh b/tests/spawn_eos.sh
@@ -25,11 +25,14 @@ ssh -tt root@$IPADDR git clone https://github.com/owncloud/ocis.git /ocis
 ssh -tt root@$IPADDR "cd /ocis && git checkout $DRONE_COMMIT_ID"
 
 # Create necessary files
-ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
-ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-identifier-registration.sh"
+# ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
+# ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
+
+ssh -tt root@$IPADDR "cd /ocis/config && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-identifier-registration.sh"
+ssh -tt root@$IPADDR "cd /ocis/config && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-identifier-registration.sh"
 
 # run ocis with eos
-ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose -f ./docker-compose-eos-ci.yml up -d"
+ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose up -d"
 
 # Some necessary configuration for eos
 ssh -tt root@$IPADDR "cd /ocis && bash /ocis/tests/config/drone/setup-eos.sh"