Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 12 additions & 13 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 Down Expand Up @@ -74,7 +73,7 @@ def codestyle():
return pipelines

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

if 'defaults' in config:
Expand Down Expand Up @@ -263,7 +262,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 @@ -335,7 +334,7 @@ def build():
return pipelines

default = {
'phpVersions': ['7.0'],
'phpVersions': ['7.1'],
'commands': [
'make dist'
],
Expand Down Expand Up @@ -460,13 +459,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 @@ -513,7 +512,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 @@ -680,7 +679,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 @@ -1257,15 +1256,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 @@ -1285,15 +1284,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
26 changes: 0 additions & 26 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
---
kind: pipeline
type: docker
name: coding-standard-php7.0

platform:
os: linux
arch: amd64

workspace:
base: /var/www/owncloud
path: server/apps/files_external_dropbox

steps:
- name: coding-standard
pull: always
image: owncloudci/php:7.0
commands:
- make test-php-style

trigger:
ref:
- refs/pull/**
- refs/tags/**
- refs/heads/master

---
kind: pipeline
type: docker
Expand Down