remove_files improved, proper docker images, tiny cleanup

docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml

@@ -51,7 +51,7 @@ services:
 
   kafka_kerberos:
     # build: ${KERBERIZED_KAFKA_DIR}
-    image: ilejn/kdc:latest
+    image: arenadata/kdc:latest
     hostname: kafka_kerberos
     volumes:
         - ${KERBERIZED_KAFKA_DIR}/secrets:/tmp/keytab

tests/integration/helpers/cluster.py

@@ -47,8 +47,10 @@ def _create_env_file(path, variables, fname=DEFAULT_ENV_NAME):
 
 def remove_files(files):
     for a_file in files:
-        if os.path.isfile(a_file):
+        try:
             os.remove(a_file)
+        except:
+            pass
 
 def subprocess_check_call(args):
     # Uncomment for debugging
@@ -179,11 +181,7 @@ class ClickHouseCluster:
                      clickhouse_path_dir=None,
                      with_odbc_drivers=False, with_postgres=False, with_hdfs=False, with_mongo=False,
                      with_redis=False, with_minio=False, with_cassandra=False,
-<<<<<<< HEAD
                      hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None,
-=======
-                     hostname=None, env_variables=None, image="ilejn/yandex_clickhouse-integration-test",
->>>>>>> test via runner is Ok, switched to custom images
                      stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
                      zookeeper_docker_compose_path=None, zookeeper_use_tmpfs=True, minio_certs_dir=None):
         """Add an instance to the cluster.

tests/integration/test_storage_kerberized_kafka/kafka_pb2.py

@@ -1,76 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: clickhouse_path/format_schemas/kafka.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='clickhouse_path/format_schemas/kafka.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n*clickhouse_path/format_schemas/kafka.proto\"*\n\x0cKeyValuePair\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\r\n\x05value\x18\x02 \x01(\tb\x06proto3')
-)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-
-
-_KEYVALUEPAIR = _descriptor.Descriptor(
-  name='KeyValuePair',
-  full_name='KeyValuePair',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='key', full_name='KeyValuePair.key', index=0,
-      number=1, type=4, cpp_type=4, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='value', full_name='KeyValuePair.value', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=46,
-  serialized_end=88,
-)
-
-DESCRIPTOR.message_types_by_name['KeyValuePair'] = _KEYVALUEPAIR
-
-KeyValuePair = _reflection.GeneratedProtocolMessageType('KeyValuePair', (_message.Message,), dict(
-  DESCRIPTOR = _KEYVALUEPAIR,
-  __module__ = 'clickhouse_path.format_schemas.kafka_pb2'
-  # @@protoc_insertion_point(class_scope:KeyValuePair)
-  ))
-_sym_db.RegisterMessage(KeyValuePair)
-
-
-# @@protoc_insertion_point(module_scope)

tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh

@@ -97,14 +97,14 @@ create_keytabs() {
   kadmin.local -q "addprinc -randkey kafka/kerberized_kafka1@${REALM}"
   kadmin.local -q "ktadd -norandkey -k /tmp/keytab/kerberized_kafka.keytab kafka/kerberized_kafka1@${REALM}"
 
-	kadmin.local -q "addprinc -randkey zkclient@${REALM}"
+  kadmin.local -q "addprinc -randkey zkclient@${REALM}"
   kadmin.local -q "ktadd -norandkey -k /tmp/keytab/zkclient.keytab zkclient@${REALM}"
 
 
-	kadmin.local -q "addprinc -randkey kafkauser/instance@${REALM}"
+  kadmin.local -q "addprinc -randkey kafkauser/instance@${REALM}"
   kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab kafkauser/instance@${REALM}"
 
-	chmod g+r /tmp/keytab/clickhouse.keytab
+  chmod g+r /tmp/keytab/clickhouse.keytab
 
 }