Skip to content

Commit

Permalink
Merge pull request #1178 from owncloud/update-drone-star-from-user_ldap
Browse files Browse the repository at this point in the history
[tests-only] [full-ci]Add federatedServerVersion flexibility to .drone.star
  • Loading branch information
phil-davis authored May 25, 2023
2 parents 87879c8 + 494de07 commit 3b11511
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ def acceptance(ctx):
"databases": ["mariadb:10.2"],
"esVersions": ["none"],
"federatedServerNeeded": False,
"federatedServerVersion": "",
"filterTags": "",
"logLevel": "2",
"emailNeeded": False,
Expand Down Expand Up @@ -1217,8 +1218,12 @@ def acceptance(ctx):
environment["S3_TYPE"] = "ceph"
if (testConfig["scalityS3"] != False):
environment["S3_TYPE"] = "scality"

federationDbSuffix = "-federated"

if len(testConfig["federatedServerVersion"]) == 0:
testConfig["federatedServerVersion"] = testConfig["server"]

result = {
"kind": "pipeline",
"type": "docker",
Expand All @@ -1230,7 +1235,7 @@ def acceptance(ctx):
"steps": skipIfUnchanged(ctx, "acceptance-tests") +
installCore(ctx, testConfig["server"], testConfig["database"], testConfig["useBundledApp"]) +
installTestrunner(ctx, DEFAULT_PHP_VERSION, testConfig["useBundledApp"]) +
(installFederated(testConfig["server"], phpVersionForDocker, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
(installFederated(testConfig["federatedServerVersion"], phpVersionForDocker, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
installAppPhp(ctx, phpVersionForDocker) +
installAppJavaScript(ctx) +
installExtraApps(phpVersionForDocker, testConfig["extraApps"]) +
Expand Down Expand Up @@ -1271,7 +1276,7 @@ def acceptance(ctx):
testConfig["extraServices"] +
owncloudService(testConfig["server"], phpVersionForDocker, "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
((
owncloudService(testConfig["server"], phpVersionForDocker, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
owncloudService(testConfig["federatedServerVersion"], phpVersionForDocker, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
databaseServiceForFederation(testConfig["database"], federationDbSuffix)
) if testConfig["federatedServerNeeded"] else []),
"depends_on": [],
Expand Down

0 comments on commit 3b11511

Please sign in to comment.