diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-03-18 19:40:23 +0300 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-04-14 13:58:28 +0300 |
| commit | 84619a5b9c58ec7f4e3d7faea8c60a187cb61243 (patch) | |
| tree | 2572e5f939f8c6bd76b4611c432aad3721b0b62e /.drone.yml | |
| parent | e4d378d01e67c41fa64a12662128ba25a0b27133 (diff) | |
use serverControls directly with LDAP calls, fixes 19127
- adapters for PHP API version to Support PHP < 7.3
- switch to pass only one base per search
- cookie logic is moved from Access to API adapters
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to '.drone.yml')
| -rw-r--r-- | .drone.yml | 47 |
1 files changed, 45 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml index a4a38d3f778..e84918ef6a0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1501,7 +1501,7 @@ trigger: --- kind: pipeline -name: integration-ldap-openldap-uid-features +name: integration-ldap-openldap-uid-features-php54-api steps: - name: submodules @@ -1509,7 +1509,7 @@ steps: commands: - git submodule update --init - name: integration-ldap-openldap-uid-features - image: nextcloudci/integration-php7.3:integration-php7.3-2 + image: nextcloudci/integration-php7.2:integration-php7.2-1 commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1539,6 +1539,49 @@ trigger: event: - pull_request - push +type: docker + +--- +kind: pipeline +name: integration-ldap-openldap-uid-features + +steps: + - name: submodules + image: docker:git + commands: + - git submodule update --init + - name: integration-ldap-openldap-uid-features + image: nextcloudci/integration-php7.3:integration-php7.3-2 + commands: + - bash tests/drone-run-integration-tests.sh || exit 0 + - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int + - ./occ config:system:set redis host --value=cache + - ./occ config:system:set redis port --value=6379 --type=integer + - ./occ config:system:set redis timeout --value=0 --type=integer + - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local + - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed + - cd build/integration + - ./run.sh ldap_features/openldap-uid-username.feature + +services: + - name: cache + image: redis + - name: openldap + image: nextcloudci/openldap:openldap-7 + environment: + SLAPD_DOMAIN: nextcloud.ci + SLAPD_ORGANIZATION: Nextcloud + SLAPD_PASSWORD: admin + SLAPD_ADDITIONAL_MODULES: memberof + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push +type: docker --- kind: pipeline |