Skip to content

Commit 0dc10ff

Browse files
committed
run ocm service on kubernetes
1 parent 1eee4a3 commit 0dc10ff

File tree

1 file changed

+52
-28
lines changed

1 file changed

+52
-28
lines changed

.drone.star

Lines changed: 52 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ S3_PUBLIC_CACHE_BUCKET = "public"
8484
# configuration
8585
config = {
8686
"cs3ApiTests": {
87-
"skip": False,
87+
"skip": True,
8888
},
8989
"wopiValidatorTests": {
90-
"skip": False,
90+
"skip": True,
9191
},
9292
"k6LoadTests": {
93-
"skip": False,
93+
"skip": True,
9494
},
9595
"localApiTests": {
9696
"contractAndLock": {
9797
"suites": [
9898
"apiContract",
9999
"apiLocks",
100100
],
101-
"skip": False,
101+
"skip": True,
102102
"k8s": True,
103103
},
104104
"settingsAndNotification": {
@@ -107,7 +107,7 @@ config = {
107107
"apiNotification",
108108
"apiCors",
109109
],
110-
"skip": False,
110+
"skip": True,
111111
"withRemotePhp": [True],
112112
"emailNeeded": True,
113113
"extraEnvironment": {
@@ -128,6 +128,7 @@ config = {
128128
"apiGraphUser",
129129
],
130130
"withRemotePhp": [True],
131+
"skip": True,
131132
},
132133
"spaces": {
133134
"suites": [
@@ -140,7 +141,7 @@ config = {
140141
"suites": [
141142
"apiSpacesShares",
142143
],
143-
"skip": False,
144+
"skip": True,
144145
"k8s": True,
145146
},
146147
"davOperations": {
@@ -152,7 +153,7 @@ config = {
152153
"apiArchiver",
153154
"apiActivities",
154155
],
155-
"skip": False,
156+
"skip": True,
156157
},
157158
"groupAndSearch1": {
158159
"suites": [
@@ -161,7 +162,7 @@ config = {
161162
"apiGraphGroup",
162163
"apiServiceAvailability",
163164
],
164-
"skip": False,
165+
"skip": True,
165166
"k8s": False,
166167
},
167168
"search2": {
@@ -170,7 +171,7 @@ config = {
170171
"apiSearchContent",
171172
],
172173
"tikaNeeded": True,
173-
"skip": False,
174+
"skip": True,
174175
"k8s": False,
175176
},
176177
"sharingNg1": {
@@ -179,7 +180,7 @@ config = {
179180
"apiReshare",
180181
"apiSharingNgPermissions",
181182
],
182-
"skip": False,
183+
"skip": True,
183184
"withRemotePhp": [True],
184185
},
185186
"sharingNgAdditionalShareRole": {
@@ -195,7 +196,7 @@ config = {
195196
"apiSharingNgDriveInvitation",
196197
"apiSharingNgItemInvitation",
197198
],
198-
"skip": False,
199+
"skip": True,
199200
"withRemotePhp": [True],
200201
},
201202
"sharingNgLinkShare": {
@@ -204,14 +205,14 @@ config = {
204205
"apiSharingNgItemLinkShare",
205206
"apiSharingNgLinkShareManagement",
206207
],
207-
"skip": False,
208+
"skip": True,
208209
"withRemotePhp": [True],
209210
},
210211
"antivirus": {
211212
"suites": [
212213
"apiAntivirus",
213214
],
214-
"skip": False,
215+
"skip": True,
215216
"antivirusNeeded": True,
216217
"extraServerEnvironment": {
217218
"ANTIVIRUS_SCANNER_TYPE": "clamav",
@@ -224,9 +225,10 @@ config = {
224225
"ocmAndAuthApp": {
225226
"suites": [
226227
"apiOcm",
227-
"apiAuthApp",
228+
# "apiAuthApp",
228229
],
229230
"skip": False,
231+
"k8s": True,
230232
"withRemotePhp": [True],
231233
"federationServer": True,
232234
"emailNeeded": True,
@@ -254,7 +256,7 @@ config = {
254256
"suites": [
255257
"apiCollaboration",
256258
],
257-
"skip": False,
259+
"skip": True,
258260
"withRemotePhp": [True],
259261
"collaborationServiceNeeded": True,
260262
"extraServerEnvironment": {
@@ -265,7 +267,7 @@ config = {
265267
"suites": [
266268
"cliCommands",
267269
],
268-
"skip": False,
270+
"skip": True,
269271
"withRemotePhp": [True],
270272
"antivirusNeeded": True,
271273
"emailNeeded": True,
@@ -294,7 +296,7 @@ config = {
294296
"coreApiMain",
295297
"coreApiVersions",
296298
],
297-
"skip": False,
299+
"skip": True,
298300
"withRemotePhp": [True],
299301
},
300302
"2": {
@@ -311,7 +313,7 @@ config = {
311313
"coreApiSharees",
312314
"coreApiSharePublicLink2",
313315
],
314-
"skip": False,
316+
"skip": True,
315317
"withRemotePhp": [True],
316318
},
317319
"4": {
@@ -333,7 +335,7 @@ config = {
333335
"coreApiWebdavEtagPropagation1",
334336
"coreApiWebdavEtagPropagation2",
335337
],
336-
"skip": False,
338+
"skip": True,
337339
"k8s": True,
338340
},
339341
"6": {
@@ -348,7 +350,7 @@ config = {
348350
"suites": [
349351
"coreApiWebdavProperties",
350352
],
351-
"skip": False,
353+
"skip": True,
352354
"k8s": True,
353355
},
354356
"8": {
@@ -358,29 +360,29 @@ config = {
358360
"coreApiWebdavUpload",
359361
"coreApiWebdavUploadTUS",
360362
],
361-
"skip": False,
363+
"skip": True,
362364
},
363365
},
364366
"e2eTests": {
365367
"part": {
366-
"skip": False,
368+
"skip": True,
367369
"totalParts": 4, # divide and run all suites in parts (divide pipelines)
368370
"xsuites": ["search", "app-provider", "oidc", "ocm", "keycloak"], # suites to skip
369371
},
370372
"search": {
371-
"skip": False,
373+
"skip": True,
372374
"suites": ["search"], # suites to run
373375
"tikaNeeded": True,
374376
},
375377
"keycloak": {
376-
"skip": False,
378+
"skip": True,
377379
"suites": ["journeys", "keycloak"],
378380
"keycloakNeeded": True,
379381
},
380382
},
381383
"e2eMultiService": {
382384
"testSuites": {
383-
"skip": False,
385+
"skip": True,
384386
"suites": [
385387
"smoke",
386388
"shares",
@@ -1086,7 +1088,7 @@ def localApiTestPipeline(ctx):
10861088
params[item] = matrix[item] if item in matrix else defaults[item]
10871089
for storage in params["storages"]:
10881090
for run_with_remote_php in params["withRemotePhp"]:
1089-
run_on_k8s = params["k8s"] and ctx.build.event == "cron"
1091+
run_on_k8s = params["k8s"] #and ctx.build.event == "cron"
10901092
ocis_url = OCIS_URL
10911093
if run_on_k8s:
10921094
ocis_url = "https://%s" % OCIS_SERVER_NAME
@@ -1100,7 +1102,7 @@ def localApiTestPipeline(ctx):
11001102
"arch": "amd64",
11011103
},
11021104
"steps": skipIfUnchanged(ctx, "acceptance-tests") +
1103-
restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin") +
1105+
# restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin") +
11041106
(tikaService() if params["tikaNeeded"] else []) +
11051107
(waitForServices("online-offices", ["collabora:9980", "onlyoffice:443", "fakeoffice:8080"]) if params["collaborationServiceNeeded"] else []) +
11061108
(waitK3sCluster() + (clamavServiceK8s() if params["antivirusNeeded"] and run_on_k8s else []) + (emailServiceK8s() if params["emailNeeded"] and run_on_k8s else []) + 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]))) +
@@ -3496,7 +3498,7 @@ def apiTestFailureLog():
34963498
"name": "api-test-failure-logs",
34973499
"image": OC_CI_PHP % DEFAULT_PHP_VERSION,
34983500
"commands": [
3499-
"cat %s/tests/acceptance/logs/failed.log" % dirs["base"],
3501+
# "cat %s/tests/acceptance/logs/failed.log" % dirs["base"],
35003502
],
35013503
"when": {
35023504
"status": [
@@ -3772,6 +3774,7 @@ def k3sCluster():
37723774
"user": "root",
37733775
"privileged": True,
37743776
"commands": [
3777+
"rm -rf ocis-charts",
37753778
"git clone --single-branch --branch main --depth 1 https://github.com/owncloud/ocis-charts.git",
37763779
"nohup dockerd-entrypoint.sh &",
37773780
"until docker ps 2>&1 > /dev/null; do sleep 1s; done",
@@ -3831,6 +3834,27 @@ def deployOcis():
38313834
],
38323835
}]
38333836

3837+
def deployFedOcis():
3838+
return [{
3839+
"name": "deploy-ocis",
3840+
"image": "ghcr.io/helmfile/helmfile:v0.156.0",
3841+
"commands": [
3842+
"cd ocis-charts",
3843+
"cp deployments/ocm-install/helmfile.yaml deployments/ocm-install/helmfile.yaml.gotmpl",
3844+
"helmfile sync",
3845+
],
3846+
"volumes": [
3847+
{
3848+
"name": "gopath",
3849+
"path": "/go",
3850+
},
3851+
],
3852+
"extra_hosts": [
3853+
"myservice.local:192.168.1.100",
3854+
"another.local:10.0.0.5",
3855+
],
3856+
}]
3857+
38343858
def clamavServiceK8s():
38353859
return [{
38363860
"name": "clamav",

0 commit comments

Comments
 (0)