Pylint merge trouble

.gitlab-ci.yml

@@ -210,17 +210,17 @@ behave-integration:
 
 # TODO: Fix https://open.greenhost.net/stackspin/single-sign-on/-/issues/82
 #
-#pylint:
-#  stage: build
-#  variables:
-#    KANIKO_CONTEXT: "test/lint/pylint"
-#    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
-#  extends: .kaniko_build
-#  only:
-#    changes:
-#      - test/lint/pylint/Dockerfile
-#      - test/lint/pylint/requirements.txt
-#      - .gitlab-ci.yml
+pylint:
+  stage: build
+  variables:
+    KANIKO_CONTEXT: "test/lint/pylint"
+    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+  extends: .kaniko_build
+  only:
+    changes:
+      - test/lint/pylint/Dockerfile
+      - test/lint/pylint/requirements.txt
+      - .gitlab-ci.yml
 #
 # pylint-lint:
 #   stage: lint