[docs-only]Update testing docs (#5444)

* Update testing docs

* make ocis run with new config

* fix wording

* fix sording

* fix command and run.sh

* Edit makefile to make it dynamically run suites

* adress reviews

* address reviews

* address reviews

tests/acceptance/docker/src/acceptance.yml

@@ -4,12 +4,10 @@ services:
     command: /bin/bash /test/run-tests.sh
     environment:
       OCIS_ROOT: /drone/src
-      PATH_TO_CORE: /srv/app/testrunner
-      SKELETON_DIR: /srv/app/tmp/testing/data/apiSkeleton
       TEST_OCIS: "true"
       RUN_ON_OCIS: "true"
       TEST_SERVER_URL: https://ocis-server:9200
-      TESTING_DIR: /srv/app/tmp/testing
+      TEST_WITH_GRAPH_API: "true"
 
       STORAGE_DRIVER: $STORAGE_DRIVER
       TEST_SOURCE: $TEST_SOURCE
@@ -21,11 +19,5 @@ services:
       - ../../../../.drone.env
     volumes:
       - ./run-tests.sh:/test/run-tests.sh
-      - oCISownCloud10testsuite:/srv
       - ../../../../:/drone/src
       - ../../../../vendor-bin/behat/composer.json:/tmp/vendor-bin/behat/composer.json
-      - oCISownCloud10testsuite-vendor:/drone/src/vendor
-
-volumes:
-  oCISownCloud10testsuite:
-  oCISownCloud10testsuite-vendor:

tests/acceptance/docker/src/ocis-base.yml

@@ -8,12 +8,20 @@ services:
       STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root
       STORAGE_USERS_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/users
       STORAGE_SYSTEM_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/metadata
-      STORAGE_SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json
+      SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json
       SETTINGS_DATA_PATH: "/srv/app/tmp/ocis/settings"
       PROXY_ENABLE_BASIC_AUTH: "true"
       WEB_UI_CONFIG: /drone/src/tests/config/drone/ocis-config.json
       ACCOUNTS_HASH_DIFFICULTY: 4
       OCIS_INSECURE: "true"
+      "IDM_CREATE_DEMO_USERS": "true"
+      "IDM_ADMIN_PASSWORD": "admin"
+      "FRONTEND_SEARCH_MIN_LENGTH": "2"
+
+      "OCIS_CORS_ALLOW_ORIGINS": "https://aphno.badal"
+
+      "POSTPROCESSING_DELAY": ${POSTPROCESSING_DELAY:-0s}
+
       # s3ng specific settings
       STORAGE_USERS_S3NG_ENDPOINT: http://ceph:8080
       STORAGE_USERS_S3NG_REGION: default
@@ -22,7 +30,8 @@ services:
       STORAGE_USERS_S3NG_BUCKET: test
     volumes:
       - ../../../config:/drone/src/tests/config
-      - oCISownCloud10testsuite:/srv
-
-volumes:
-  oCISownCloud10testsuite:
+    entrypoint: /bin/sh
+    # run ocis init to initialize a configuration file with random secrets
+    # it will fail on subsequent runs, because the config file already exists
+    # therefore we ignore the error and then start the ocis server
+    command: ["-c", "ocis init || true; ocis server"]

tests/acceptance/docker/src/run-tests.sh

@@ -5,42 +5,21 @@
 
 git config --global advice.detachedHead false
 
-## GET DEPENDENCIES
-
-if cd $TESTING_DIR > /dev/null 2>&1
-then
-    git pull
-else
-    git clone -b master --depth=1 https://github.com/owncloud/testing.git $TESTING_DIR
-fi
-
-if cd $PATH_TO_CORE > /dev/null 2>&1
-then
-    git checkout $CORE_BRANCH
-    git pull
-    git checkout $CORE_COMMITID
-else
-    git clone -b $CORE_BRANCH --single-branch --no-tags https://github.com/owncloud/core.git $PATH_TO_CORE
-    cd $PATH_TO_CORE
-    git checkout $CORE_COMMITID
-fi
-
 ## CONFIGURE TEST
 
 if [ "$TEST_SOURCE" = "oc10" ]
 then
-    if [ "$STORAGE_DRIVER" = "owncloud" ]
-    then
-        export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/'
-        export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OC-Storage'
-        export OCIS_SKELETON_STRATEGY='copy'
-        export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md'
-    elif [ "$STORAGE_DRIVER" = "ocis" ]
+    if [ "$STORAGE_DRIVER" = "ocis" ]
     then
         export OCIS_REVA_DATA_ROOT=''
         export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage'
         export OCIS_SKELETON_STRATEGY='upload'
         export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md'
+    elif [ "$STORAGE_DRIVER" = "s3ng" ]
+    then
+        export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage'
+        export OCIS_REVA_DATA_ROOT=''
+        export OCIS_SKELETON_STRATEGY='upload'
     else
         echo "non existing STORAGE selected"
         exit 1
@@ -51,12 +30,7 @@ then
 elif [ "$TEST_SOURCE" = "ocis" ]
 then
 
-    if [ "$STORAGE_DRIVER" = "owncloud" ]
-    then
-        export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OC-Storage'
-        export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/'
-        export OCIS_SKELETON_STRATEGY='copy'
-    elif [ "$STORAGE_DRIVER" = "ocis" ]
+    if [ "$STORAGE_DRIVER" = "ocis" ]
     then
         export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OCIS-Storage'
         export OCIS_REVA_DATA_ROOT=''
@@ -95,12 +69,12 @@ fi
 
 if [ "$TEST_SOURCE" = "oc10" ]
 then
-    make -C /srv/app/testrunner test-acceptance-api
+   sleep 10
+   make -C $OCIS_ROOT test-acceptance-from-core-api
 elif [ "$TEST_SOURCE" = "ocis" ]
 then
-    cd $OCIS_ROOT
     sleep 10
-    make test-acceptance-api
+    make -C $OCIS_ROOT test-acceptance-api
 else
     echo "non existing TEST_SOURCE selected"
     exit 1