From b64d03279586c0b26ca73818e9d5110176d8ae7b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 27 Oct 2023 08:42:18 +0200 Subject: [PATCH] Enable LDAP tests with redis Signed-off-by: Joas Schilling --- .github/workflows/integration-sqlite.yml | 31 ++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index b9739182a73..036e8770830 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -63,7 +63,7 @@ jobs: - 'federation_features' - '--tags ~@large files_features' - 'filesdrop_features' - #- 'ldap_features' + - 'ldap_features' - 'remoteapi_features' - 'setup_features' - 'sharees_features' @@ -73,6 +73,24 @@ jobs: php-versions: ['8.2'] spreed-versions: ['main'] + services: + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 6379:6379 + openldap: + image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 + env: + SLAPD_DOMAIN: nextcloud.ci + SLAPD_ORGANIZATION: Nextcloud + SLAPD_PASSWORD: admin + SLAPD_ADDITIONAL_MODULES: memberof + steps: - name: Checkout server uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 @@ -92,7 +110,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation - extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, ldap, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development env: @@ -118,6 +136,15 @@ jobs: ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin ./occ config:system:set hashing_default_password --value=true --type=boolean + - name: Configure caching + if: ${{ matrix.test-suite == 'ldap_features' }} + run: | + ./occ config:system:set redis host --value=localhost + ./occ config:system:set redis port --value=6379 --type=integer + ./occ config:system:set redis timeout --value=0 --type=integer + ./occ config:system:set memcache.local --value='\OC\Memcache\Redis' + ./occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' + - name: Run integration working-directory: build/integration run: bash run.sh ${{ matrix.test-suite }} no-tail-log -- 2.39.5