Skip to content

[tests-only] [full-ci] Adjust drone code to allow for variation of PHP docker images #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
individual-it merged 2 commits into from
Oct 13, 2022
Merged

[tests-only] [full-ci] Adjust drone code to allow for variation of PHP docker images #1139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afc1032
Fix drone pipeline name length problem
phil-davis Oct 7, 2022
75b7fbe
Shorten pipeline name in PHP unit tests
phil-davis Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,14 +851,20 @@ def phpTests(ctx, testType, withCoverage):
else:
command = "make test-php-integration"

# Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
# And use that for constructing the pipeline name
# That helps shorten pipeline names when using owncloud-ci images
# that have longer names like 7.4-ubuntu20.04
phpVersionForPipelineName = phpVersion[0:3]

for server in params["servers"]:
for db in params["databases"]:
keyString = "-" + category if params["includeKeyInMatrixName"] else ""
if len(params["servers"]) > 1:
serverString = "-%s" % server.replace("daily-", "").replace("-qa", "")
else:
serverString = ""
name = "%s%s-php%s%s-%s" % (testType, keyString, phpVersion, serverString, db.replace(":", ""))
name = "%s%s-php%s%s-%s" % (testType, keyString, phpVersionForPipelineName, serverString, db.replace(":", ""))
maxLength = 50
nameLength = len(name)
if nameLength > maxLength:
Expand Down Expand Up @@ -1130,12 +1136,19 @@ def acceptance(ctx):
continue

name = "unknown"
phpVersionForDocker = testConfig["phpVersion"]

# Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
# And use that for constructing the pipeline name
# That helps shorten pipeline names when using owncloud-ci images
# that have longer names like 7.4-ubuntu20.04
phpVersionForPipelineName = phpVersionForDocker[0:3]
if isWebUI or isAPI or isCLI:
esString = "-es" + testConfig["esVersion"] if testConfig["esVersion"] != "none" else ""
browserString = "" if testConfig["browser"] == "" else "-" + testConfig["browser"]
keyString = "-" + category if testConfig["includeKeyInMatrixName"] else ""
partString = "" if testConfig["numberOfParts"] == 1 else "-%d-%d" % (testConfig["numberOfParts"], testConfig["runPart"])
name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, testConfig["server"].replace("daily-", "").replace("-qa", ""), browserString, testConfig["database"].replace(":", ""), testConfig["phpVersion"], esString)
name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, testConfig["server"].replace("daily-", "").replace("-qa", ""), browserString, testConfig["database"].replace(":", ""), phpVersionForPipelineName, esString)
maxLength = 50
nameLength = len(name)
if nameLength > maxLength:
Expand Down Expand Up @@ -1203,19 +1216,19 @@ 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"], testConfig["phpVersion"], testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
installAppPhp(ctx, testConfig["phpVersion"]) +
(installFederated(testConfig["server"], phpVersionForDocker, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
installAppPhp(ctx, phpVersionForDocker) +
installAppJavaScript(ctx) +
installExtraApps(testConfig["phpVersion"], testConfig["extraApps"]) +
setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
installExtraApps(phpVersionForDocker, testConfig["extraApps"]) +
setupServerAndApp(ctx, phpVersionForDocker, testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
owncloudLog("server") +
setupCeph(testConfig["cephS3"]) +
setupScality(testConfig["scalityS3"]) +
setupElasticSearch(testConfig["esVersion"]) +
testConfig["extraSetup"] +
waitForServer(testConfig["federatedServerNeeded"]) +
waitForEmailService(testConfig["emailNeeded"]) +
fixPermissions(testConfig["phpVersion"], testConfig["federatedServerNeeded"], params["selUserNeeded"]) +
fixPermissions(phpVersionForDocker, testConfig["federatedServerNeeded"], params["selUserNeeded"]) +
waitForBrowserService(testConfig["browser"]) +
[
({
Expand All @@ -1241,9 +1254,9 @@ def acceptance(ctx):
scalityService(testConfig["scalityS3"]) +
elasticSearchService(testConfig["esVersion"]) +
testConfig["extraServices"] +
owncloudService(testConfig["server"], testConfig["phpVersion"], "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
owncloudService(testConfig["server"], phpVersionForDocker, "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
((
owncloudService(testConfig["server"], testConfig["phpVersion"], "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
owncloudService(testConfig["server"], phpVersionForDocker, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
databaseServiceForFederation(testConfig["database"], federationDbSuffix)
) if testConfig["federatedServerNeeded"] else []),
"depends_on": [],
Expand Down