Skip to content

Commit

Permalink
update core commit id
Browse files Browse the repository at this point in the history
  • Loading branch information
dpakach committed Sep 14, 2020
1 parent 8a87486 commit 10b178e
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
config = {
'apiTests': {
'coreBranch': 'master',
'coreCommit': 'e9850b40657ff78f32cb5585ec00342fe07a5ff2',
'numberOfParts': 4
'coreBranch': 'uid-gid-user-create',
'coreCommit': 'c731fc3ba0858811aef6d3b56002f67b6f9f42f8',
'numberOfParts': 1
},
'uiTests': {
'phoenixBranch': 'master',
Expand Down
16 changes: 16 additions & 0 deletions start-eos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
docker-compose exec -d ocis /start-ldap

# time for ldap service to starup within ocis container
sleep 5

# Configure ocis
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


15 changes: 15 additions & 0 deletions tests/config/drone/setup-eos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ do
sleep 5
done

docker-compose down

echo $OCIS_DOMAIN

OCIS_DOMAIN=${OCIS_DOMAIN} docker-compose exec up -d

# wait for ocis to start
until $(curl -k --output /dev/null --silent --head --fail https://localhost:9200);
do
echo '.'
sleep 5
done

sleep 5

docker-compose exec -d ocis /start-ldap

# time for ldap service to starup within ocis container
Expand Down
2 changes: 1 addition & 1 deletion tests/spawn_eos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ ssh -tt root@$IPADDR "cd /ocis/config && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/
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"
ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/setup-eos.sh"

0 comments on commit 10b178e

Please sign in to comment.