Skip to content

Commit 5ef4f75

Browse files
anon-pradipanon-pradip
committed
test: patch deplyment file for only webDavPreview suite of coreApi8 suite group
1 parent 220119f commit 5ef4f75

File tree

3 files changed

+61
-51
lines changed

3 files changed

+61
-51
lines changed

‎.drone.star‎

Lines changed: 47 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ S3_PUBLIC_CACHE_BUCKET = "public"
8585
# configuration
8686
config = {
8787
"cs3ApiTests": {
88-
"skip": False,
88+
"skip": True,
8989
},
9090
"wopiValidatorTests": {
91-
"skip": False,
91+
"skip": True,
9292
},
9393
"k6LoadTests": {
94-
"skip": False,
94+
"skip": True,
9595
},
9696
"localApiTests": {
9797
"contractAndLock": {
9898
"suites": [
9999
"apiContract",
100100
"apiLocks",
101101
],
102-
"skip": False,
102+
"skip": True,
103103
"k8s": True,
104104
},
105105
"settingsAndNotification": {
@@ -108,7 +108,7 @@ config = {
108108
"apiNotification",
109109
"apiCors",
110110
],
111-
"skip": False,
111+
"skip": True,
112112
"withRemotePhp": [False],
113113
"emailNeeded": True,
114114
"extraEnvironment": {
@@ -128,22 +128,22 @@ config = {
128128
"suites": [
129129
"apiGraphUser",
130130
],
131-
"skip": False,
131+
"skip": True,
132132
"withRemotePhp": [False],
133133
"k8s": True,
134134
},
135135
"spaces": {
136136
"suites": [
137137
"apiSpaces",
138138
],
139-
"skip": False,
139+
"skip": True,
140140
"k8s": True,
141141
},
142142
"spacesShares": {
143143
"suites": [
144144
"apiSpacesShares",
145145
],
146-
"skip": False,
146+
"skip": True,
147147
"k8s": True,
148148
},
149149
"davOperations": {
@@ -155,7 +155,7 @@ config = {
155155
"apiArchiver",
156156
"apiActivities",
157157
],
158-
"skip": False,
158+
"skip": True,
159159
},
160160
"groupAndSearch1": {
161161
"suites": [
@@ -181,15 +181,15 @@ config = {
181181
"apiReshare",
182182
"apiSharingNgPermissions",
183183
],
184-
"skip": False,
184+
"skip": True,
185185
"withRemotePhp": [False],
186186
"k8s": True,
187187
},
188188
"sharingNgAdditionalShareRole": {
189189
"suites": [
190190
"apiSharingNgAdditionalShareRole",
191191
],
192-
"skip": False,
192+
"skip": True,
193193
"k8s": True,
194194
"withRemotePhp": [False],
195195
},
@@ -198,7 +198,7 @@ config = {
198198
"apiSharingNgDriveInvitation",
199199
"apiSharingNgItemInvitation",
200200
],
201-
"skip": False,
201+
"skip": True,
202202
"withRemotePhp": [False],
203203
},
204204
"sharingNgLinkShare": {
@@ -231,7 +231,7 @@ config = {
231231
"apiOcm",
232232
"apiServiceAvailability",
233233
],
234-
"skip": False,
234+
"skip": True,
235235
"withRemotePhp": [False],
236236
"federationServer": True,
237237
"emailNeeded": True,
@@ -269,7 +269,7 @@ config = {
269269
"suites": [
270270
"apiCollaboration",
271271
],
272-
"skip": False,
272+
"skip": True,
273273
"withRemotePhp": [False],
274274
"collaborationServiceNeeded": True,
275275
"extraServerEnvironment": {
@@ -280,7 +280,7 @@ config = {
280280
"suites": [
281281
"cliCommands",
282282
],
283-
"skip": False,
283+
"skip": True,
284284
"withRemotePhp": [False],
285285
"antivirusNeeded": True,
286286
"emailNeeded": True,
@@ -309,7 +309,7 @@ config = {
309309
"coreApiMain",
310310
"coreApiVersions",
311311
],
312-
"skip": False,
312+
"skip": True,
313313
"withRemotePhp": [False],
314314
"k8s": True,
315315
},
@@ -318,7 +318,7 @@ config = {
318318
"coreApiShareManagementBasicToShares",
319319
"coreApiShareManagementToShares",
320320
],
321-
"skip": False,
321+
"skip": True,
322322
"k8s": True,
323323
"withRemotePhp": [False],
324324
},
@@ -327,7 +327,7 @@ config = {
327327
"coreApiSharees",
328328
"coreApiSharePublicLink2",
329329
],
330-
"skip": False,
330+
"skip": True,
331331
"withRemotePhp": [False],
332332
},
333333
"4": {
@@ -339,7 +339,7 @@ config = {
339339
"coreApiShareCreateSpecialToShares2",
340340
"coreApiShareUpdateToShares",
341341
],
342-
"skip": False,
342+
"skip": True,
343343
"k8s": True,
344344
"withRemotePhp": [False],
345345
},
@@ -350,7 +350,7 @@ config = {
350350
"coreApiWebdavEtagPropagation1",
351351
"coreApiWebdavEtagPropagation2",
352352
],
353-
"skip": False,
353+
"skip": True,
354354
"k8s": True,
355355
},
356356
"6": {
@@ -359,13 +359,13 @@ config = {
359359
"coreApiWebdavOperations",
360360
"coreApiWebdavMove2",
361361
],
362-
"skip": False,
362+
"skip": True,
363363
},
364364
"7": {
365365
"suites": [
366366
"coreApiWebdavProperties",
367367
],
368-
"skip": False,
368+
"skip": True,
369369
"k8s": True,
370370
},
371371
"8": {
@@ -381,24 +381,24 @@ config = {
381381
},
382382
"e2eTests": {
383383
"part": {
384-
"skip": False,
384+
"skip": True,
385385
"totalParts": 4, # divide and run all suites in parts (divide pipelines)
386386
"xsuites": ["search", "app-provider", "oidc", "ocm", "keycloak"], # suites to skip
387387
},
388388
"search": {
389-
"skip": False,
389+
"skip": True,
390390
"suites": ["search"], # suites to run
391391
"tikaNeeded": True,
392392
},
393393
"keycloak": {
394-
"skip": False,
394+
"skip": True,
395395
"suites": ["journeys", "keycloak"],
396396
"keycloakNeeded": True,
397397
},
398398
},
399399
"e2eMultiService": {
400400
"testSuites": {
401-
"skip": False,
401+
"skip": True,
402402
"suites": [
403403
"smoke",
404404
"shares",
@@ -509,8 +509,6 @@ def main(ctx):
509509
licenseCheck(ctx)
510510

511511
test_pipelines = \
512-
codestyle(ctx) + \
513-
checkGherkinLint(ctx) + \
514512
checkTestSuitesInExpectedFailures(ctx) + \
515513
buildWebCache(ctx) + \
516514
getGoBinForTesting(ctx) + \
@@ -1406,7 +1404,7 @@ def coreApiTestPipeline(ctx):
14061404
for run_with_remote_php in params["withRemotePhp"]:
14071405
filter_tags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS")
14081406
expected_failures_file = "%s/expected-failures-API-on-%s-storage.md" % (test_dir, storage.upper())
1409-
run_on_k8s = params["k8s"] and ctx.build.event == "cron"
1407+
run_on_k8s = params["k8s"]
14101408
ocis_url = OCIS_URL
14111409
if run_on_k8s:
14121410
ocis_url = "https://%s" % OCIS_SERVER_NAME
@@ -1423,7 +1421,7 @@ def coreApiTestPipeline(ctx):
14231421
(tikaService() if params["tikaNeeded"] else []) +
14241422
(waitForClamavService() if params["antivirusNeeded"] else []) +
14251423
(waitForEmailService() if params["emailNeeded"] else []) +
1426-
(waitK3sCluster() + prepareOcisDeployment(name) + setupOcisConfigMaps(name) + deployOcis() + waitForOcis(ocis_url = ocis_url) + ociswrapper() + waitForOciswrapper() if run_on_k8s else ocisServer(storage, extra_server_environment = params["extraServerEnvironment"], with_wrapper = True, tika_enabled = params["tikaNeeded"], volumes = ([stepVolumeOcisStorage]))) +
1424+
(waitK3sCluster() + prepareOcisDeployment(name, params["suites"]) + setupOcisConfigMaps(name, params["suites"]) + deployOcis() + waitForOcis(ocis_url = ocis_url) + ociswrapper() + waitForOciswrapper() if run_on_k8s else ocisServer(storage, extra_server_environment = params["extraServerEnvironment"], with_wrapper = True, tika_enabled = params["tikaNeeded"], volumes = ([stepVolumeOcisStorage]))) +
14271425
[
14281426
{
14291427
"name": "run-api-tests",
@@ -3807,11 +3805,6 @@ def k3sCluster():
38073805
"kubectl create configmap coredns-custom -n kube-system " +
38083806
"--from-literal='rewritehost.override=rewrite name exact %s host.k3d.internal'" % OCIS_SERVER_NAME,
38093807
"kubectl -n kube-system rollout restart deployment coredns",
3810-
# Setup Unicode font support for thumbnails - create ConfigMaps
3811-
"kubectl create namespace ocis || true",
3812-
"echo '{\"defaultFont\": \"/etc/ocis/fonts/NotoSans.ttf\"}' > %s/fontsMap.json" % dirs["base"],
3813-
"kubectl create configmap -n ocis ocis-fonts-ttf --from-file=%s/tests/config/drone/NotoSans.ttf" % dirs["base"],
3814-
"kubectl create configmap -n ocis ocis-fonts-map --from-file=%s/fontsMap.json" % dirs["base"],
38153808
# watch events
38163809
"kubectl get events -Aw",
38173810
],
@@ -3830,7 +3823,7 @@ def waitK3sCluster():
38303823
],
38313824
}]
38323825

3833-
def prepareOcisDeployment(suite_name = ""):
3826+
def prepareOcisDeployment(suite_name = "", suites = []):
38343827
commands = [
38353828
"make -C %s build" % dirs["ocisWrapper"],
38363829
"mv %s/tests/config/drone/k8s/values.yaml %s/ocis-charts/charts/ocis/ci/deployment-values.yaml" % (dirs["base"], dirs["base"]),
@@ -3852,6 +3845,15 @@ def prepareOcisDeployment(suite_name = ""):
38523845
"sed -i 's|name: sharing-banned-passwords-{{ .appName }}|name: sharing-banned-passwords|' ./charts/ocis/templates/sharing/deployment.yaml",
38533846
])
38543847

3848+
# Add specific patches for coreApiWebdavPreviews suite
3849+
if "coreApiWebdavPreviews" in suites:
3850+
commands.extend([
3851+
# Patch thumbnails deployment to mount Unicode fonts (ConfigMaps created in k3sCluster)
3852+
"sed -i '/- name: THUMBNAILS_TRANSFER_TOKEN/i\\\\ - name: THUMBNAILS_TXT_FONTMAP_FILE\\\n value: /etc/ocis/fontsMap.json\\\n' ./charts/ocis/templates/thumbnails/deployment.yaml",
3853+
"sed -i '/volumeMounts:/a\\\\ - name: ocis-fonts-ttf\\\n mountPath: /etc/ocis/fonts\\\n - name: ocis-fonts-map\\\n mountPath: /etc/ocis/fontsMap.json\\\n subPath: fontsMap.json' ./charts/ocis/templates/thumbnails/deployment.yaml",
3854+
"sed -i '/volumes:/a\\\\ - name: ocis-fonts-ttf\\\n configMap:\\\n name: ocis-fonts-ttf\\\n - name: ocis-fonts-map\\\n configMap:\\\n name: ocis-fonts-map' ./charts/ocis/templates/thumbnails/deployment.yaml",
3855+
])
3856+
38553857
return [{
38563858
"name": "prepare-ocis-deployment",
38573859
"image": "owncloudci/golang:latest",
@@ -3864,7 +3866,7 @@ def prepareOcisDeployment(suite_name = ""):
38643866
],
38653867
}]
38663868

3867-
def setupOcisConfigMaps(suite_name = ""):
3869+
def setupOcisConfigMaps(suite_name = "", suites = []):
38683870
commands = [
38693871
"export KUBECONFIG=%s/kubeconfig-$${DRONE_BUILD_NUMBER}.yaml" % dirs["base"],
38703872
# Create namespace for oCIS deployment
@@ -3877,6 +3879,14 @@ def setupOcisConfigMaps(suite_name = ""):
38773879
"kubectl create configmap -n ocis sharing-banned-passwords --from-file=banned-password-list.txt=%s/tests/config/drone/banned-password-list.txt" % dirs["base"],
38783880
)
38793881

3882+
# Setup Unicode font support for thumbnails - create ConfigMaps
3883+
if "coreApiWebdavPreviews" in suites:
3884+
commands.extend([
3885+
"echo '{\"defaultFont\": \"/etc/ocis/fonts/NotoSans.ttf\"}' > %s/fontsMap.json" % dirs["base"],
3886+
"kubectl create configmap -n ocis ocis-fonts-ttf --from-file=%s/tests/config/drone/NotoSans.ttf" % dirs["base"],
3887+
"kubectl create configmap -n ocis ocis-fonts-map --from-file=%s/fontsMap.json" % dirs["base"],
3888+
])
3889+
38803890
return [{
38813891
"name": "setup-configmaps",
38823892
"image": K3D_IMAGE,

‎tests/acceptance/features/coreApiWebdavPreviews/previews.feature‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,10 @@ Feature: previews of files downloaded through the webdav API
407407
@issue-10589 @env-config
408408
Scenario Outline: download a file preview when the maximum thumbnail input value in the environment is set to a valid value
409409
Given the following configs have been set:
410-
| config | value |
411-
| THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 1KB |
412-
| THUMBNAILS_MAX_INPUT_WIDTH | 700 |
413-
| THUMBNAILS_MAX_INPUT_HEIGHT | 700 |
410+
| service | config | value |
411+
| thumbnails | THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 1KB |
412+
| thumbnails | THUMBNAILS_MAX_INPUT_WIDTH | 700 |
413+
| thumbnails | THUMBNAILS_MAX_INPUT_HEIGHT | 700 |
414414
And using <dav-path-version> DAV path
415415
And user "Alice" has uploaded file with content "hello world" to "test.txt"
416416
When user "Alice" downloads the preview of "/test.txt" with width "32" and height "32" and processor thumbnail using the WebDAV API
@@ -424,10 +424,10 @@ Feature: previews of files downloaded through the webdav API
424424
@issue-10589 @env-config
425425
Scenario Outline: download an image preview when the maximum thumbnail input value in the environment is set to a valid value
426426
Given the following configs have been set:
427-
| config | value |
428-
| THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 36KB |
429-
| THUMBNAILS_MAX_INPUT_WIDTH | 1250 |
430-
| THUMBNAILS_MAX_INPUT_HEIGHT | 650 |
427+
| service | config | value |
428+
| thumbnails | THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 36KB |
429+
| thumbnails | THUMBNAILS_MAX_INPUT_WIDTH | 1250 |
430+
| thumbnails | THUMBNAILS_MAX_INPUT_HEIGHT | 650 |
431431
And using <dav-path-version> DAV path
432432
And user "Alice" has uploaded file "filesForUpload/testavatar.png" to "/testimage.png"
433433
When user "Alice" downloads the preview of "/testimage.png" with width "32" and height "32" and processor thumbnail using the WebDAV API

‎tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Feature: sizing of previews of files downloaded through the webdav API
2121
| request-width | request-height | return-width | return-height | dav-path-version |
2222
| 1 | 1 | 16 | 16 | old |
2323
| 32 | 32 | 32 | 32 | old |
24-
| 1024 | 1024 | 640 | 480 | old |
24+
| 1024 | 1024 | 640 | 640 | old |
2525
| 1 | 1024 | 16 | 16 | old |
26-
| 1024 | 1 | 640 | 480 | old |
26+
| 1024 | 1 | 640 | 640 | old |
2727
| 1 | 1 | 16 | 16 | new |
2828
| 32 | 32 | 32 | 32 | new |
29-
| 1024 | 1024 | 640 | 480 | new |
29+
| 1024 | 1024 | 640 | 640 | new |
3030
| 1 | 1024 | 16 | 16 | new |
31-
| 1024 | 1 | 640 | 480 | new |
31+
| 1024 | 1 | 640 | 640 | new |
3232
| 1 | 1 | 16 | 16 | spaces |
3333
| 32 | 32 | 32 | 32 | spaces |
34-
| 1024 | 1024 | 640 | 480 | spaces |
34+
| 1024 | 1024 | 640 | 640 | spaces |
3535
| 1 | 1024 | 16 | 16 | spaces |
36-
| 1024 | 1 | 640 | 480 | spaces |
36+
| 1024 | 1 | 640 | 640 | spaces |

0 commit comments

Comments
 (0)