Skip to content

Commit

Permalink
Merge pull request #198 from owncloud/drop-php7.0
Browse files Browse the repository at this point in the history
Drop PHP 7.0 from drone CI
  • Loading branch information
individual-it authored Nov 28, 2019
2 parents b9db381 + 6253f33 commit 69f365f
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 140 deletions.
28 changes: 13 additions & 15 deletions .drone.starlark
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ config = {
'codestyle': {
'ordinary' : {
'phpVersions': [
'7.0',
'7.1',
'7.2',
'7.3',
Expand All @@ -29,12 +28,11 @@ config = {
'phpunit': {
'allDatabases' : {
'phpVersions': [
'7.0',
'7.1',
]
},
'reducedDatabases' : {
'phpVersions': [
'7.1',
'7.2',
'7.3',
],
Expand Down Expand Up @@ -89,7 +87,7 @@ def codestyle():
return pipelines

default = {
'phpVersions': ['7.0'],
'phpVersions': ['7.1'],
}

if 'defaults' in config:
Expand Down Expand Up @@ -278,7 +276,7 @@ def phan():
return pipelines

default = {
'phpVersions': ['7.0', '7.1', '7.2', '7.3'],
'phpVersions': ['7.1', '7.2', '7.3'],
}

if 'defaults' in config:
Expand Down Expand Up @@ -350,7 +348,7 @@ def build():
return pipelines

default = {
'phpVersions': ['7.0'],
'phpVersions': ['7.1'],
'commands': [
'make dist'
],
Expand Down Expand Up @@ -475,13 +473,13 @@ def javascript():
},
'steps':
installCore('daily-master-qa', 'sqlite', False) +
installApp('7.0') +
setupServerAndApp('7.0', params['logLevel']) +
installApp('7.1') +
setupServerAndApp('7.1', params['logLevel']) +
params['extraSetup'] +
[
{
'name': 'js-tests',
'image': 'owncloudci/php:7.0',
'image': 'owncloudci/php:7.1',
'pull': 'always',
'environment': params['extraEnvironment'],
'commands': params['extraCommandsBeforeTestRun'] + [
Expand Down Expand Up @@ -528,7 +526,7 @@ def phptests(testType):
errorFound = False

default = {
'phpVersions': ['7.0', '7.1', '7.2', '7.3'],
'phpVersions': ['7.1', '7.2', '7.3'],
'databases': [
'sqlite', 'mariadb:10.2', 'mysql:5.5', 'mysql:5.7', 'postgres:9.4', 'oracle'
],
Expand Down Expand Up @@ -695,7 +693,7 @@ def acceptance():
default = {
'servers': ['daily-master-qa', 'latest'],
'browsers': ['chrome'],
'phpVersions': ['7.0'],
'phpVersions': ['7.1'],
'databases': ['mariadb:10.2'],
'federatedServerNeeded': False,
'filterTags': '',
Expand Down Expand Up @@ -1272,15 +1270,15 @@ def setupCeph(serviceParams):

createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
'wait-for-it -t 60 ceph:80',
'wait-for-it -t 120 ceph:80',
'cd /var/www/owncloud/server/apps/files_primary_s3',
'cp tests/drone/ceph.config.php /var/www/owncloud/server/config',
'cd /var/www/owncloud/server',
]

return [{
'name': 'setup-ceph',
'image': 'owncloudci/php:7.0',
'image': 'owncloudci/php:7.1',
'pull': 'always',
'commands': setupCommands + ([
'./apps/files_primary_s3/tests/drone/create-bucket.sh',
Expand All @@ -1300,15 +1298,15 @@ def setupScality(serviceParams):
createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
createExtraBuckets = serviceParams['createExtraBuckets'] if 'createExtraBuckets' in serviceParams else False
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
'wait-for-it -t 60 scality:8000',
'wait-for-it -t 120 scality:8000',
'cd /var/www/owncloud/server/apps/files_primary_s3',
'cp tests/drone/%s /var/www/owncloud/server/config' % configFile,
'cd /var/www/owncloud/server'
]

return [{
'name': 'setup-scality',
'image': 'owncloudci/php:7.0',
'image': 'owncloudci/php:7.1',
'pull': 'always',
'commands': setupCommands + ([
'php occ s3:create-bucket owncloud --accept-warning'
Expand Down
Loading

0 comments on commit 69f365f

Please sign in to comment.