From 911b6dc0d6ccd5996b027489a474bf76bda5c202 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Tue, 24 Oct 2023 12:11:57 +0300
Subject: [PATCH 1/3] Pin pylint-django to 2.5.3

v2.5.5 switches to pylint 3.x which errors out with:

File "/home/runner/work/trackers-integration/Kiwi/kiwi_lint/dunder_attributes.py", line 11, in DunderClassAttributeChecker
    __implements__ = (interfaces.IAstroidChecker,)
AttributeError: module 'pylint.interfaces' has no attribute 'IAstroidChecker'
---
 devel.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel.txt b/devel.txt
index 45902ba..abbec1f 100644
--- a/devel.txt
+++ b/devel.txt
@@ -2,7 +2,7 @@
 
 flake8
 kiwitcms
-pylint-django
+pylint-django==2.5.3
 textdistance
 twine
 readme_renderer[md]

From 2ffd2861034b6321356caac8d291adb3b5da86b4 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Tue, 24 Oct 2023 12:39:53 +0300
Subject: [PATCH 2/3] Use a different OpenLDAP docker image for testing

because openshift/openldap-2441-centos7 reports 404
---
 docker-compose.testing | 9 +++++++--
 testing/ldap.ldif      | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker-compose.testing b/docker-compose.testing
index 1e6cafe..4f8bce0 100644
--- a/docker-compose.testing
+++ b/docker-compose.testing
@@ -3,11 +3,16 @@ version: '2'
 services:
     openldap_server:
         container_name: openldap_server
-        image: openshift/openldap-2441-centos7
+        image: bitnami/openldap
         restart: always
         ports:
             - 389:389
-            - 636:636
+        environment:
+            - LDAP_PORT_NUMBER=389
+            - LDAP_ADMIN_USERNAME=Manager
+            - LDAP_ADMIN_PASSWORD=admin
+            - LDAP_ROOT=dc=example,dc=com
+            - LDAP_USER_DC=People
 
     db:
         container_name: db
diff --git a/testing/ldap.ldif b/testing/ldap.ldif
index f540a2b..e760ebd 100644
--- a/testing/ldap.ldif
+++ b/testing/ldap.ldif
@@ -1,6 +1,7 @@
-dn: ou=People,dc=example,dc=com
-ou: People
-objectClass: organizationalUnit
+# b/c will be created when OpenLDAP initializes
+# dn: ou=People,dc=example,dc=com
+# ou: People
+# objectClass: organizationalUnit
 
 dn: uid=ldap_atodorov,ou=People,dc=example,dc=com
 cn: ldap_atodorov

From fe9ec7b64fb6ce8bdff50252a42c63409a019564 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Wed, 25 Oct 2023 10:14:42 +0300
Subject: [PATCH 3/3] DEBUG: disable UI test: login via LDAP

---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 9cc37b8..90cc48f 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -150,7 +150,7 @@ jobs:
             sudo apt-get install firefox-geckodriver
         fi
 
-        robot testing/ldap.robot
+        # robot testing/ldap.robot
 
         docker exec -i web /Kiwi/manage.py ldap_sync_users
         cat testing/ldap.py | docker exec -i web /Kiwi/manage.py shell