fix idp schema, add virtual setup (#2219)

cs3org · Nov 3, 2021 · a4fb51f · a4fb51f
1 parent a21af87
commit a4fb51f
Show file tree

Hide file tree

Showing 33 changed files with 784 additions and 122 deletions.
diff --git a/.drone.star b/.drone.star
@@ -105,6 +105,7 @@ def main(ctx):
     litmusOcisOldWebdav(),
     litmusOcisNewWebdav(),
     litmusOcisSpacesDav(),
+    virtualViews(),
   ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12)
 
 
@@ -484,6 +485,64 @@ def release():
     "depends_on": ['changelog'],
   }
 
+def virtualViews():
+  return {
+    "kind": "pipeline",
+    "type": "docker",
+    "name": "virtual-views",
+    "platform": {
+      "os": "linux",
+      "arch": "amd64",
+    },
+    "trigger": {
+      "event": {
+        "include": [
+          "pull_request",
+          "tag",
+        ],
+      },
+    },
+    "steps": [
+      makeStep("build-ci"),
+      {
+        "name": "revad-services",
+        "image": "registry.cern.ch/docker.io/library/golang:1.17",
+        "detach": True,
+        "commands": [
+          "cd /drone/src/tests/oc-integration-tests/drone/",
+          "/drone/src/cmd/revad/revad -c frontend-global.toml &",
+          "/drone/src/cmd/revad/revad -c gateway.toml &",
+          "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
+          "/drone/src/cmd/revad/revad -c storage-local-1.toml &",
+          "/drone/src/cmd/revad/revad -c storage-local-2.toml &",
+          "/drone/src/cmd/revad/revad -c users.toml",
+        ],
+      },
+      cloneOc10TestReposStep(),
+      {
+        "name": "oC10APIAcceptanceTestsOcisStorage",
+        "image": "registry.cern.ch/docker.io/owncloudci/php:7.4",
+        "commands": [
+          "cd /drone/src",
+          "make test-acceptance-api",
+        ],
+        "environment": {
+          "PATH_TO_CORE": "/drone/src/tmp/testrunner",
+          "TEST_SERVER_URL": "http://revad-services:20180",
+          "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
+          "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
+          "STORAGE_DRIVER": "OCIS",
+          "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
+          "TEST_REVA": "true",
+          "REGULAR_USER_PASSWORD": "relativity",
+          "SEND_SCENARIO_LINE_REFERENCES": "true",
+          "BEHAT_SUITE": "apiVirtualViews",
+        },
+      },
+    ],
+    "depends_on": ['changelog'],
+  }
+
 def litmusOcisOldWebdav():
   return {
     "kind": "pipeline",
@@ -701,7 +760,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
             "environment": {
               "TEST_SERVER_URL": "http://revad-services:20080",
               "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-*",
+              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
               "STORAGE_DRIVER": "OCIS",
               "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
               "TEST_WITH_LDAP": "true",
@@ -776,7 +835,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
             "environment": {
               "TEST_SERVER_URL": "http://revad-services:20080",
               "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-*",
+              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
               "STORAGE_DRIVER": "S3NG",
               "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
               "TEST_WITH_LDAP": "true",

diff --git a/changelog/unreleased/add-virtual-view-tests.md b/changelog/unreleased/add-virtual-view-tests.md
@@ -0,0 +1,3 @@
+Enhancement: add virtual view tests
+
+https://github.com/cs3org/reva/pull/2219
diff --git a/examples/meshdirectory/groups.demo.json b/examples/meshdirectory/groups.demo.json
@@ -2,7 +2,7 @@
   {
     "id": {
       "opaque_id": "sailing-lovers",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "sailing-lovers",
     "mail": "sailing-lovers@example.org",
@@ -12,15 +12,15 @@
       {
         "id": {
           "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "violin-haters",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "violin-haters",
     "mail": "violin-haters@example.org",
@@ -30,15 +30,15 @@
       {
         "id": {
           "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "radium-lovers",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "radium-lovers",
     "mail": "radium-lovers@example.org",
@@ -48,15 +48,15 @@
       {
         "id": {
           "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "polonium-lovers",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "polonium-lovers",
     "mail": "polonium-lovers@example.org",
@@ -66,15 +66,15 @@
       {
         "id": {
           "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "quantum-lovers",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "quantum-lovers",
     "mail": "quantum-lovers@example.org",
@@ -84,15 +84,15 @@
       {
         "id": {
           "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "philosophy-haters",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "philosophy-haters",
     "mail": "philosophy-haters@example.org",
@@ -102,15 +102,15 @@
       {
         "id": {
           "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]
   },
   {
     "id": {
       "opaque_id": "physics-lovers",
-      "idp": "localhost:20080"
+      "idp": "http://localhost:20080"
     },
     "group_name": "physics-lovers",
     "mail": "physics-lovers@example.org",
@@ -120,19 +120,19 @@
       {
         "id": {
           "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       },
       {
         "id": {
           "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       },
       {
         "id": {
           "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-          "idp": "localhost:20080"
+          "idp": "http://localhost:20080"
         }
       }
     ]

diff --git a/examples/meshdirectory/users.demo.json b/examples/meshdirectory/users.demo.json
@@ -2,7 +2,7 @@
 	{
 		"id": {
 			"opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-			"idp": "localhost:20080",
+			"idp": "http://localhost:20080",
 			"type": 1
 		},
 		"username": "einstein",
@@ -14,7 +14,7 @@
 	{
 		"id": {
 			"opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-			"idp": "localhost:20080",
+			"idp": "http://localhost:20080",
 			"type": 1
 		},
 		"username": "marie",
@@ -26,7 +26,7 @@
 	{
 		"id": {
 			"opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-			"idp": "localhost:20080",
+			"idp": "http://localhost:20080",
 			"type": 1
 		},
 		"username": "richard",