Skip to content

Commit

Permalink
Merge pull request #163 from owncloud/test-with-mysql-8.0
Browse files Browse the repository at this point in the history
[tests-only] Apply latest drone starlark code
  • Loading branch information
individual-it committed Feb 16, 2021
2 parents ca0f6e8 + e1d6553 commit 750c31e
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def jscodestyle():
'steps': [
{
'name': 'coding-standard-js',
'image': 'owncloudci/php:7.2',
'image': 'owncloudci/php:8.0',
'pull': 'always',
'commands': [
'make test-js-style'
Expand Down Expand Up @@ -490,13 +490,13 @@ def javascript(ctx):
},
'steps':
installCore('daily-master-qa', 'sqlite', False) +
installApp('7.2') +
setupServerAndApp('7.2', params['logLevel']) +
installApp('7.4') +
setupServerAndApp('7.4', params['logLevel']) +
params['extraSetup'] +
[
{
'name': 'js-tests',
'image': 'owncloudci/php:7.2',
'image': 'owncloudci/php:8.0',
'pull': 'always',
'environment': params['extraEnvironment'],
'commands': params['extraCommandsBeforeTestRun'] + [
Expand Down Expand Up @@ -1580,7 +1580,7 @@ def databaseServiceForFederation(db, suffix):
print('Not implemented federated database for ', dbName)
return []

return [{
service = {
'name': dbName + suffix,
'image': db,
'pull': 'always',
Expand All @@ -1590,7 +1590,10 @@ def databaseServiceForFederation(db, suffix):
'MYSQL_DATABASE': getDbDatabase(db) + suffix,
'MYSQL_ROOT_PASSWORD': getDbRootPassword()
}
}]
}
if (db == 'mysql:8.0'):
service['command'] = ['--default-authentication-plugin=mysql_native_password']
return [service]

def buildTestConfig(params):
configs = []
Expand Down

0 comments on commit 750c31e

Please sign in to comment.