diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 40d90ffe..07b6ca61 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -60,7 +60,7 @@ jobs: if: matrix.command == 'docker-image' run: | git clone https://github.com/kiwitcms/openldap.git - pushd openldap/ && git checkout openldap-2.4.41 && SKIP_SQUASH=1 make build && popd + pushd openldap/ && docker build -t kiwitcms/openldap-fedora34 -f images/Dockerfile . && popd - name: Sanity test - boot the docker image if: matrix.command == 'docker-image' @@ -179,8 +179,23 @@ jobs: name: kc-json-files path: ./*.json + - name: Collect docker logs + if: always() && matrix.command == 'docker-image' + run: | + docker logs keycloak_server > keyclock_server.log + docker logs openldap_server > openldap_server.log + docker logs web > kiwitcms.log + docker logs db > database.log + + - name: Upload logs + if: always() && matrix.command == 'docker-image' + uses: actions/upload-artifact@v3 + with: + name: docker-logs + path: ./*.log + - name: Sanity test - shut down the docker image - if: matrix.command == 'docker-image' + if: always() && matrix.command == 'docker-image' run: | docker kill keycloak_server docker-compose -f docker-compose.testing down diff --git a/docker-compose.testing b/docker-compose.testing index 1e6cafe3..a55633df 100644 --- a/docker-compose.testing +++ b/docker-compose.testing @@ -3,7 +3,7 @@ version: '2' services: openldap_server: container_name: openldap_server - image: openshift/openldap-2441-centos7 + image: kiwitcms/openldap-fedora34 restart: always ports: - 389:389 diff --git a/test_settings.py b/test_settings.py index 2d6400d2..46f75b22 100644 --- a/test_settings.py +++ b/test_settings.py @@ -28,6 +28,21 @@ LDAP_AUTH_USE_TLS = True LDAP_AUTH_SEARCH_BASE = "ou=People,dc=example,dc=com" +LOGGING = { + "version": 1, + "disable_existing_loggers": False, + "handlers": { + "console": { + "class": "logging.StreamHandler", + }, + }, + "loggers": { + "django_python3_ldap": { + "handlers": ["console"], + "level": "INFO", + }, + }, +} SOCIAL_AUTH_KEYCLOAK_KEY = 'kiwitcms-web-app' SOCIAL_AUTH_KEYCLOAK_SECRET = os.environ["KC_CLIENT_SECRET"] diff --git a/testing/ldap.ldif b/testing/ldap.ldif index f540a2b3..c5e060f6 100644 --- a/testing/ldap.ldif +++ b/testing/ldap.ldif @@ -1,6 +1,6 @@ -dn: ou=People,dc=example,dc=com -ou: People -objectClass: organizationalUnit +# dn: ou=People,dc=example,dc=com +# ou: People +# objectClass: organizationalUnit dn: uid=ldap_atodorov,ou=People,dc=example,dc=com cn: ldap_atodorov