Skip to content

Commit 8a68e18

Browse files
anon-pradipanon-pradip
committed
test: enable other suites too for final
1 parent 97de30e commit 8a68e18

File tree

1 file changed

+43
-33
lines changed

1 file changed

+43
-33
lines changed

‎.drone.star‎

Lines changed: 43 additions & 33 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": True,
88+
"skip": False,
8989
},
9090
"wopiValidatorTests": {
91-
"skip": True,
91+
"skip": False,
9292
},
9393
"k6LoadTests": {
94-
"skip": True,
94+
"skip": False,
9595
},
9696
"localApiTests": {
9797
"contractAndLock": {
9898
"suites": [
9999
"apiContract",
100100
"apiLocks",
101101
],
102-
"skip": True,
102+
"skip": False,
103103
"k8s": True,
104104
},
105105
"settingsAndNotification": {
@@ -108,7 +108,7 @@ config = {
108108
"apiNotification",
109109
"apiCors",
110110
],
111-
"skip": True,
111+
"skip": False,
112112
"withRemotePhp": [False],
113113
"emailNeeded": True,
114114
"extraEnvironment": {
@@ -128,22 +128,22 @@ config = {
128128
"suites": [
129129
"apiGraphUser",
130130
],
131-
"skip": True,
131+
"skip": False,
132132
"withRemotePhp": [False],
133133
"k8s": True,
134134
},
135135
"spaces": {
136136
"suites": [
137137
"apiSpaces",
138138
],
139-
"skip": True,
139+
"skip": False,
140140
"k8s": True,
141141
},
142142
"spacesShares": {
143143
"suites": [
144144
"apiSpacesShares",
145145
],
146-
"skip": True,
146+
"skip": False,
147147
"k8s": True,
148148
},
149149
"davOperations": {
@@ -155,15 +155,15 @@ config = {
155155
"apiArchiver",
156156
"apiActivities",
157157
],
158-
"skip": True,
158+
"skip": False,
159159
},
160160
"groupAndSearch1": {
161161
"suites": [
162162
"apiSearch1",
163163
"apiGraph",
164164
"apiGraphGroup",
165165
],
166-
"skip": True,
166+
"skip": False,
167167
"k8s": True,
168168
},
169169
"search2": {
@@ -172,7 +172,7 @@ config = {
172172
"apiSearchContent",
173173
],
174174
"tikaNeeded": True,
175-
"skip": True,
175+
"skip": False,
176176
"k8s": True,
177177
},
178178
"sharingNg1": {
@@ -181,15 +181,15 @@ config = {
181181
"apiReshare",
182182
"apiSharingNgPermissions",
183183
],
184-
"skip": True,
184+
"skip": False,
185185
"withRemotePhp": [False],
186186
"k8s": True,
187187
},
188188
"sharingNgAdditionalShareRole": {
189189
"suites": [
190190
"apiSharingNgAdditionalShareRole",
191191
],
192-
"skip": True,
192+
"skip": False,
193193
"k8s": True,
194194
"withRemotePhp": [False],
195195
},
@@ -198,7 +198,7 @@ config = {
198198
"apiSharingNgDriveInvitation",
199199
"apiSharingNgItemInvitation",
200200
],
201-
"skip": True,
201+
"skip": False,
202202
"withRemotePhp": [False],
203203
},
204204
"sharingNgLinkShare": {
@@ -207,15 +207,15 @@ config = {
207207
"apiSharingNgItemLinkShare",
208208
"apiSharingNgLinkShareManagement",
209209
],
210-
"skip": True,
210+
"skip": False,
211211
"k8s": True,
212212
"withRemotePhp": [False],
213213
},
214214
"antivirus": {
215215
"suites": [
216216
"apiAntivirus",
217217
],
218-
"skip": True,
218+
"skip": False,
219219
"k8s": True,
220220
"antivirusNeeded": True,
221221
"extraServerEnvironment": {
@@ -231,7 +231,7 @@ config = {
231231
"apiOcm",
232232
"apiServiceAvailability",
233233
],
234-
"skip": True,
234+
"skip": False,
235235
"withRemotePhp": [False],
236236
"federationServer": True,
237237
"emailNeeded": True,
@@ -257,7 +257,7 @@ config = {
257257
"suites": [
258258
"apiAuthApp",
259259
],
260-
"skip": True,
260+
"skip": False,
261261
"k8s": True,
262262
"withRemotePhp": [False],
263263
"extraServerEnvironment": {
@@ -281,7 +281,7 @@ config = {
281281
"suites": [
282282
"cliCommands",
283283
],
284-
"skip": True,
284+
"skip": False,
285285
"withRemotePhp": [False],
286286
"antivirusNeeded": True,
287287
"emailNeeded": True,
@@ -310,7 +310,7 @@ config = {
310310
"coreApiMain",
311311
"coreApiVersions",
312312
],
313-
"skip": True,
313+
"skip": False,
314314
"withRemotePhp": [False],
315315
"k8s": True,
316316
},
@@ -319,7 +319,7 @@ config = {
319319
"coreApiShareManagementBasicToShares",
320320
"coreApiShareManagementToShares",
321321
],
322-
"skip": True,
322+
"skip": False,
323323
"k8s": True,
324324
"withRemotePhp": [False],
325325
},
@@ -328,7 +328,7 @@ config = {
328328
"coreApiSharees",
329329
"coreApiSharePublicLink2",
330330
],
331-
"skip": True,
331+
"skip": False,
332332
"withRemotePhp": [False],
333333
"k8s": True,
334334
},
@@ -341,7 +341,7 @@ config = {
341341
"coreApiShareCreateSpecialToShares2",
342342
"coreApiShareUpdateToShares",
343343
],
344-
"skip": True,
344+
"skip": False,
345345
"k8s": True,
346346
"withRemotePhp": [False],
347347
},
@@ -352,7 +352,7 @@ config = {
352352
"coreApiWebdavEtagPropagation1",
353353
"coreApiWebdavEtagPropagation2",
354354
],
355-
"skip": True,
355+
"skip": False,
356356
"k8s": True,
357357
},
358358
"6": {
@@ -361,13 +361,13 @@ config = {
361361
"coreApiWebdavOperations",
362362
"coreApiWebdavMove2",
363363
],
364-
"skip": True,
364+
"skip": False,
365365
},
366366
"7": {
367367
"suites": [
368368
"coreApiWebdavProperties",
369369
],
370-
"skip": True,
370+
"skip": False,
371371
"k8s": True,
372372
},
373373
"8": {
@@ -383,24 +383,24 @@ config = {
383383
},
384384
"e2eTests": {
385385
"part": {
386-
"skip": True,
386+
"skip": False,
387387
"totalParts": 4, # divide and run all suites in parts (divide pipelines)
388388
"xsuites": ["search", "app-provider", "oidc", "ocm", "keycloak"], # suites to skip
389389
},
390390
"search": {
391-
"skip": True,
391+
"skip": False,
392392
"suites": ["search"], # suites to run
393393
"tikaNeeded": True,
394394
},
395395
"keycloak": {
396-
"skip": True,
396+
"skip": False,
397397
"suites": ["journeys", "keycloak"],
398398
"keycloakNeeded": True,
399399
},
400400
},
401401
"e2eMultiService": {
402402
"testSuites": {
403-
"skip": True,
403+
"skip": False,
404404
"suites": [
405405
"smoke",
406406
"shares",
@@ -511,11 +511,15 @@ def main(ctx):
511511
licenseCheck(ctx)
512512

513513
test_pipelines = \
514+
codestyle(ctx) + \
515+
checkGherkinLint(ctx) + \
514516
checkTestSuitesInExpectedFailures(ctx) + \
515517
buildWebCache(ctx) + \
516518
getGoBinForTesting(ctx) + \
517519
buildOcisBinaryForTesting(ctx) + \
518520
checkStarlark() + \
521+
build_release_helpers + \
522+
testOcisAndUploadResults(ctx) + \
519523
testPipelines(ctx)
520524

521525
build_release_pipelines = \
@@ -536,7 +540,7 @@ def main(ctx):
536540
),
537541
)
538542

539-
pipelines = test_pipelines
543+
pipelines = test_pipelines + build_release_pipelines
540544

541545
# nightly Trivy security scan (non-blocking)
542546
pipelines.append(trivyScan(ctx))
@@ -734,6 +738,8 @@ def testOcis(ctx):
734738
},
735739
{
736740
"name": "test",
741+
"image": OC_CI_GOLANG,
742+
"environment": DRONE_HTTP_PROXY_ENV,
737743
"commands": [
738744
"export KUBECONFIG=%s/kubeconfig-$${DRONE_BUILD_NUMBER}.yaml" % dirs["base"],
739745
"until test -f $${KUBECONFIG}; do sleep 1; done",
@@ -1106,7 +1112,7 @@ def localApiTestPipeline(ctx):
11061112
params[item] = matrix[item] if item in matrix else defaults[item]
11071113
for storage in params["storages"]:
11081114
for run_with_remote_php in params["withRemotePhp"]:
1109-
run_on_k8s = params["k8s"]
1115+
run_on_k8s = params["k8s"] and ctx.build.event == "cron"
11101116
ocis_url = OCIS_URL
11111117
if run_on_k8s:
11121118
ocis_url = "https://%s" % OCIS_SERVER_NAME
@@ -1444,7 +1450,7 @@ def coreApiTestPipeline(ctx):
14441450
for run_with_remote_php in params["withRemotePhp"]:
14451451
filter_tags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS")
14461452
expected_failures_file = "%s/expected-failures-API-on-%s-storage.md" % (test_dir, storage.upper())
1447-
run_on_k8s = params["k8s"]
1453+
run_on_k8s = params["k8s"] and ctx.build.event == "cron"
14481454
ocis_url = OCIS_URL
14491455
if run_on_k8s:
14501456
ocis_url = "https://%s" % OCIS_SERVER_NAME
@@ -3949,6 +3955,10 @@ def prepareOcisDeployment(suite_name = "", enable_wopi = False):
39493955
"sed -i 's|- name: configs|- name: banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml",
39503956
"sed -i 's|mountPath: /etc/ocis$|mountPath: /etc/ocis/config/drone|' ./charts/ocis/templates/frontend/deployment.yaml",
39513957
"sed -i 's|name: sharing-banned-passwords-{{ .appName }}|name: sharing-banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml",
3958+
# Patch thumbnails deployment to mount Unicode fonts (ConfigMaps created in k3sCluster)
3959+
"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",
3960+
"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",
3961+
"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",
39523962
# Add OCIS_CONFIG_DIR env var to appregistry deployment
39533963
"cat > /tmp/patch_appregistry.py << 'EOF'" + "\n" +
39543964
"with open('./charts/ocis/templates/appregistry/deployment.yaml', 'r') as f:" + "\n" +

0 commit comments

Comments
 (0)