From b9ca0fed764cac9a6289c68a8ebcd1c36796be53 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 22 Jun 2023 10:20:58 +0200 Subject: [PATCH 01/57] initial implementation --- doc/user_guide/user_guide.rst | 4 ++-- .../cli/cli.py | 2 +- .../lib/test_environment/ports.py | 13 ++++++++++--- pytest_itde/__init__.py | 5 +++-- test/integration/pytest_itde_test.py | 4 ++-- test/unit/pytest_plugin_itde_test.py | 7 ++++--- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/doc/user_guide/user_guide.rst b/doc/user_guide/user_guide.rst index fbe3a5bec..bdd3e03c7 100644 --- a/doc/user_guide/user_guide.rst +++ b/doc/user_guide/user_guide.rst @@ -244,8 +244,8 @@ The following config files are available: # Database IP in environment docker network export ITDE_DATABASE_HOST=172.21.0.2 - export ITDE_DATABASE_DB_PORT=8888 - export ITDE_DATABASE_BUCKETFS_PORT=6583 + export ITDE_DATABASE_DB_PORT=8563 + export ITDE_DATABASE_BUCKETFS_PORT=2580 export ITDE_DATABASE_SSH_PORT=22 export ITDE_DATABASE_CONTAINER_NAME=db_container_test export ITDE_DATABASE_CONTAINER_NETWORK_ALIASES="exasol_test_database db_container_test" diff --git a/exasol_integration_test_docker_environment/cli/cli.py b/exasol_integration_test_docker_environment/cli/cli.py index 5806cd2da..c8cc14351 100644 --- a/exasol_integration_test_docker_environment/cli/cli.py +++ b/exasol_integration_test_docker_environment/cli/cli.py @@ -17,7 +17,7 @@ def cli(): Spawn an ITDE test environment: $ itde spawn-test-environment --environment-name test \\ - --database-port-forward 8888 --bucketfs-port-forward 6666 \\ + --database-port-forward 8563 --bucketfs-port-forward 2580 \\ --docker-db-image-version 7.1.9 --db-mem-size 4GB """ pass diff --git a/exasol_integration_test_docker_environment/lib/test_environment/ports.py b/exasol_integration_test_docker_environment/lib/test_environment/ports.py index ed1547083..bd267d457 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/ports.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/ports.py @@ -36,15 +36,22 @@ class PortsType(type): @property def default_ports(self) -> 'Ports': - return Ports(database=8888, bucketfs=6583, ssh=22) + # return Ports(database=8888, bucketfs=6583, ssh=22) + return Ports(database=8563, bucketfs=2580, ssh=22) @property def external(self) -> 'Ports': - return Ports(database=8563, bucketfs=6583, ssh=22) + # return Ports(database=8563, bucketfs=6583, ssh=22) + return Ports(database=8563, bucketfs=2580, ssh=22) @property def docker(self) -> 'Ports': - return Ports(database=8888, bucketfs=6583, ssh=22) + # return Ports(database=8888, bucketfs=6583, ssh=22) + return Ports(database=8563, bucketfs=2580, ssh=22) + + @property + def forward(self) -> 'Ports': + return Ports(database=8563, bucketfs=2580, ssh=20002) class Ports(metaclass=PortsType): diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index e82eaa563..3cc413794 100644 --- a/pytest_itde/__init__.py +++ b/pytest_itde/__init__.py @@ -43,7 +43,7 @@ { "name": "url", "type": str, - "default": "http://127.0.0.1:6666", + "default": f"http://127.0.0.1:{Ports.default.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { @@ -166,7 +166,8 @@ def start_db(name, itde, exasol, bucketfs): environment_name=name, database_port_forward=exasol.port, bucketfs_port_forward=bucketfs_url.port, - ssh_port_forward=20002, + # should this rather be passed as a parameter to _bootstrap_db()? + ssh_port_forward=Ports.forward.ssh, db_mem_size="4GB", docker_db_image_version=itde.db_version, ) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 5f905635e..e1f3833fc 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -47,7 +47,7 @@ def test_itde_smoke_test(make_test_files, pytester, files): """ def test_default_settings_of_exasol(exasol_config): assert exasol_config.host == 'localhost' - assert exasol_config.port == 8888 + assert exasol_config.port == 8563 assert exasol_config.username == 'SYS' assert exasol_config.password == 'exasol' """ @@ -57,7 +57,7 @@ def test_default_settings_of_exasol(exasol_config): "test_bucketfs_settings": cleandoc( """ def test_default_settings_of_bucketfs(bucketfs_config): - assert bucketfs_config.url == 'http://127.0.0.1:6666' + assert bucketfs_config.url == 'http://127.0.0.1:2580' assert bucketfs_config.username == 'w' assert bucketfs_config.password == 'write' """ diff --git a/test/unit/pytest_plugin_itde_test.py b/test/unit/pytest_plugin_itde_test.py index 0509fff06..551879171 100644 --- a/test/unit/pytest_plugin_itde_test.py +++ b/test/unit/pytest_plugin_itde_test.py @@ -2,6 +2,7 @@ from pytest_itde import TestSchemas from pytest_itde.config import Option, OptionGroup +from exasol_integration_test_docker_environment.lib.test_environment.ports import Ports OPTIONS = ( Option( @@ -87,7 +88,7 @@ def test_test_schema_parser(definition, expected): { "name": "port", "type": int, - "default": 8888, + "default": Ports.default.database, "help_text": "Port on which the exasol db is listening", }, { @@ -108,7 +109,7 @@ def test_test_schema_parser(definition, expected): { "name": "url", "type": str, - "default": "http://127.0.0.1:6666", + "default": f"http://127.0.0.1:{Ports.default.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { @@ -155,7 +156,7 @@ def test_option_group_prefix_property(group, expected): prefix="exasol", name="port", type=int, - default=8888, + default=Ports.default.database, help_text="Port on which the exasol db is listening", ), Option( From 975f8ac21fb7c1f5e5dc4e4e621101abe7e99a58 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 22 Jun 2023 10:24:07 +0200 Subject: [PATCH 02/57] Annotated properties of class Ports with references to usages --- .../lib/test_environment/ports.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/ports.py b/exasol_integration_test_docker_environment/lib/test_environment/ports.py index bd267d457..5f1c1ca30 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/ports.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/ports.py @@ -41,11 +41,19 @@ def default_ports(self) -> 'Ports': @property def external(self) -> 'Ports': + """ + Used by + eitde/test/test_test_env_reuse.py + eitde/cli/options/test_environment_options.py + """ # return Ports(database=8563, bucketfs=6583, ssh=22) return Ports(database=8563, bucketfs=2580, ssh=22) @property def docker(self) -> 'Ports': + """ + Only used in pytest_itde/__init__.py + """ # return Ports(database=8888, bucketfs=6583, ssh=22) return Ports(database=8563, bucketfs=2580, ssh=22) From c1b5d1878ede2bfe77d5ab9f8eb183e739d106bc Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 22 Jun 2023 10:34:38 +0200 Subject: [PATCH 03/57] Updated changes_2.0.0.md --- doc/changes/changes_2.0.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changes/changes_2.0.0.md b/doc/changes/changes_2.0.0.md index 12922a526..f05b0e70e 100644 --- a/doc/changes/changes_2.0.0.md +++ b/doc/changes/changes_2.0.0.md @@ -26,3 +26,4 @@ If you need further versions, please open an issue. * #329: Added CLI option `--ssh-port-forward` to forward SSH port * #343: Added SshInfo to DatabaseInfo containing user, port and path to SSH key file +* #308: Unified ports for database, BucketFS, and SSH From 482219a74b963326d3bae9d6a19599fb29f746eb Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 22 Jun 2023 16:32:22 +0200 Subject: [PATCH 04/57] Replaced ports in EXAConf by template variables --- docker_db_config_template/7.0.0/EXAConf | 6 ++--- docker_db_config_template/7.1.0/EXAConf | 6 ++--- docker_db_config_template/8.17.0/EXAConf | 6 ++--- docker_db_config_template/8.18.1/EXAConf | 6 ++--- .../docker_db_config/7.0.0/EXAConf | 6 ++--- .../docker_db_config/7.0.1/EXAConf | 6 ++--- .../docker_db_config/7.0.10/EXAConf | 6 ++--- .../docker_db_config/7.0.11/EXAConf | 6 ++--- .../docker_db_config/7.0.12/EXAConf | 6 ++--- .../docker_db_config/7.0.13/EXAConf | 6 ++--- .../docker_db_config/7.0.14/EXAConf | 6 ++--- .../docker_db_config/7.0.15/EXAConf | 6 ++--- .../docker_db_config/7.0.16/EXAConf | 6 ++--- .../docker_db_config/7.0.17/EXAConf | 6 ++--- .../docker_db_config/7.0.18/EXAConf | 6 ++--- .../docker_db_config/7.0.19/EXAConf | 6 ++--- .../docker_db_config/7.0.2/EXAConf | 6 ++--- .../docker_db_config/7.0.20/EXAConf | 6 ++--- .../docker_db_config/7.0.3/EXAConf | 6 ++--- .../docker_db_config/7.0.4/EXAConf | 6 ++--- .../docker_db_config/7.0.6/EXAConf | 6 ++--- .../docker_db_config/7.0.7/EXAConf | 6 ++--- .../docker_db_config/7.0.8/EXAConf | 6 ++--- .../docker_db_config/7.0.9/EXAConf | 6 ++--- .../docker_db_config/7.1.0/EXAConf | 6 ++--- .../docker_db_config/7.1.1/EXAConf | 6 ++--- .../docker_db_config/7.1.10/EXAConf | 6 ++--- .../docker_db_config/7.1.11/EXAConf | 6 ++--- .../docker_db_config/7.1.12/EXAConf | 6 ++--- .../docker_db_config/7.1.13/EXAConf | 6 ++--- .../docker_db_config/7.1.14/EXAConf | 6 ++--- .../docker_db_config/7.1.15/EXAConf | 6 ++--- .../docker_db_config/7.1.16/EXAConf | 6 ++--- .../docker_db_config/7.1.17/EXAConf | 6 ++--- .../docker_db_config/7.1.2/EXAConf | 6 ++--- .../docker_db_config/7.1.3/EXAConf | 6 ++--- .../docker_db_config/7.1.4/EXAConf | 6 ++--- .../docker_db_config/7.1.5/EXAConf | 6 ++--- .../docker_db_config/7.1.6/EXAConf | 6 ++--- .../docker_db_config/7.1.7/EXAConf | 6 ++--- .../docker_db_config/7.1.8/EXAConf | 6 ++--- .../docker_db_config/7.1.9/EXAConf | 6 ++--- .../docker_db_config/8.17.0/EXAConf | 6 ++--- .../docker_db_config/8.18.1/EXAConf | 24 +++++++++---------- .../test_environment/spawn_test_database.py | 16 +++++++------ pytest_itde/__init__.py | 2 +- 46 files changed, 151 insertions(+), 149 deletions(-) diff --git a/docker_db_config_template/7.0.0/EXAConf b/docker_db_config_template/7.0.0/EXAConf index 5634bf01b..6ec215c70 100644 --- a/docker_db_config_template/7.0.0/EXAConf +++ b/docker_db_config_template/7.0.0/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/docker_db_config_template/7.1.0/EXAConf b/docker_db_config_template/7.1.0/EXAConf index 0193d203b..ab78d47de 100644 --- a/docker_db_config_template/7.1.0/EXAConf +++ b/docker_db_config_template/7.1.0/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/docker_db_config_template/8.17.0/EXAConf b/docker_db_config_template/8.17.0/EXAConf index d775c3bd4..4b1e330c1 100644 --- a/docker_db_config_template/8.17.0/EXAConf +++ b/docker_db_config_template/8.17.0/EXAConf @@ -105,7 +105,7 @@ UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +159,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -198,7 +198,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ= diff --git a/docker_db_config_template/8.18.1/EXAConf b/docker_db_config_template/8.18.1/EXAConf index 41accbd32..04f5f986e 100644 --- a/docker_db_config_template/8.18.1/EXAConf +++ b/docker_db_config_template/8.18.1/EXAConf @@ -105,7 +105,7 @@ UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +159,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -200,7 +200,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf index 5634bf01b..6ec215c70 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf @@ -75,7 +75,7 @@ UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +121,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -155,7 +155,7 @@ [BucketFS : bfsdefault] Owner = 500:500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf index 0193d203b..ab78d47de 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf @@ -89,7 +89,7 @@ UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +135,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -172,7 +172,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs= diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf index d775c3bd4..4b1e330c1 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf @@ -105,7 +105,7 @@ UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +159,7 @@ Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -198,7 +198,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ= diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf index 2c20aaae4..04f5f986e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf @@ -36,7 +36,7 @@ CoredAllowOnlySameSubnet = True # Which subnets Cored will allow messages from. Each subnet must be sepparated by a comma. # A subnet is either an IPv4 or IPv6 address in CIDR notation. - CoredSubnets = + CoredSubnets = # SSL options [SSL] @@ -47,7 +47,7 @@ # Options to verify certificates: none, optional, required CertVerify = none # Domain name in the certifcate - CertDomainName = + CertDomainName = # Docker related options [Docker] @@ -60,7 +60,7 @@ DeviceType = file # Comma-separated list of volumes to be mounted in all containers (e. g. '/mnt/my_data:/exa/my_data:rw' ) # These user-defined volumes are mounted additionally to the internal ones (like the node root volume) - AdditionalVolumes = + AdditionalVolumes = [Groups] [[root]] @@ -84,7 +84,7 @@ Group = root LoginEnabled = True AdditionalGroups = exausers, exaadm, exadbadm, exastoradm, exabfsadm, exasaasadm - AuthorizedKeys = {{authorized_keys}} + AuthorizedKeys = {{ authorized_keys }} [[exadefusr]] ID = 500 Group = exausers @@ -97,15 +97,15 @@ AdditionalGroups = exasaasadm, [Node : 11] - PrivateNet = {{private_network}} - PublicNet = + PrivateNet = {{ private_network }} + PublicNet = Name = n11 # Affinity decides how this node is used in the cluster. i.e, the possibility to become master Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 + ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -116,7 +116,7 @@ # Enable or disable background recovery / data restoration (does not affect on-demand recovery) BgRecEnabled = True # Max. throughput for background recovery / data restoration (in MiB/s) - BgRecLimit = + BgRecLimit = # Space usage threshold (in percent, per node) for sending a warning SpaceWarnThreshold = 90 @@ -156,10 +156,10 @@ # Unique id of this database. ID = aCbUZhU3R8eEc0UIDS7wQw # Version nr. of this database. - Version = {{db_version}} + Version = {{ db_version }} # Memory size over all nodes (e. g. '1 TiB'). MemSize = {{ mem_size }} - Port = 8888 + Port = {{ db_port }} # User and group IDs that own this database (e. g. '1000:1005'). Owner = 500 : 500 # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any). @@ -186,7 +186,7 @@ # Directory within the bucket that contains the drivers Dir = drivers/jdbc # Additional URLs used to search for JDBC drivers, like: bucketfs://bfs2/bucket3/jdbcdir or file:///exa/etc/jdbc_drivers. - AdditionalURLs = + AdditionalURLs = # Oracle driver configuration [[Oracle]] # BucketFS that contains the JDBC drivers @@ -200,7 +200,7 @@ [BucketFS : bfsdefault] Owner = 500 : 500 # HTTP port number (0 = disabled) - HttpPort = 6583 + HttpPort = {{ bucketfs_port }} # HTTPS port number (0 = disabled) HttpsPort = 0 SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ= diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 844ebd32a..1b1dad8bc 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -64,6 +64,7 @@ def __init__(self, *args, **kwargs): self.db_version = DbVersion.from_db_version_str(self.docker_db_image_version) self.docker_db_config_resource_name = f"docker_db_config/{self.db_version}" + self.ports = Ports.default_ports def run_task(self): subnet = netaddr.IPNetwork(self.network_info.subnet) @@ -119,14 +120,13 @@ def _connect_docker_network( def _port_mappings(self): result = {} - defaults = Ports.default_ports if self.database_port_forward is not None: - result[f"{defaults.database}/tcp"] = ('0.0.0.0', int(self.database_port_forward)) + result[f"{self.ports.database}/tcp"] = ('0.0.0.0', int(self.database_port_forward)) if self.bucketfs_port_forward is not None: - result[f"{defaults.bucketfs}/tcp"] = ('0.0.0.0', int(self.bucketfs_port_forward)) + result[f"{self.ports.bucketfs}/tcp"] = ('0.0.0.0', int(self.bucketfs_port_forward)) if self.ssh_port_forward is None: self.ssh_port_forward = find_free_ports(1)[0] - result[f"{defaults.ssh}/tcp"] = ('0.0.0.0', int(self.ssh_port_forward)) + result[f"{self.ports.ssh}/tcp"] = ('0.0.0.0', int(self.ssh_port_forward)) return result def _create_database_container(self, db_ip_address: str, db_private_network: str): @@ -159,7 +159,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): docker_db_image_info, ) - ports = self._port_mappings() + port_mappings = self._port_mappings() volumes = {db_volume.name: {"bind": "/exa", "mode": "rw"}} if self.certificate_volume_name is not None: volumes[self.certificate_volume_name] = {"bind": CERTIFICATES_MOUNT_DIR, "mode": "ro"} @@ -171,7 +171,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): privileged=True, volumes=volumes, network_mode=None, - ports=ports, + ports=port_mappings, runtime=self.docker_runtime ) enable_ssh_access(db_container, authorized_keys) @@ -196,7 +196,7 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf ssh_info = SshInfo(self.ssh_user, self.ssh_port_forward, self.ssh_key_file) database_info = DatabaseInfo( host=db_ip_address, - ports=Ports.default_ports, + ports=self.ports, reused=reused, container_info=container_info, ssh_info=ssh_info, @@ -329,6 +329,8 @@ def _add_exa_conf( additional_db_parameter_str = " ".join(self.additional_db_parameter) rendered_template = template.render(private_network=db_private_network, db_version=str(self.db_version), + db_port=self.ports.database, + bucketfs_port=self.ports.bucketfs, image_version=self.docker_db_image_version, mem_size=self.mem_size, disk_size=self.disk_size, diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index 3cc413794..fac69b9eb 100644 --- a/pytest_itde/__init__.py +++ b/pytest_itde/__init__.py @@ -43,7 +43,7 @@ { "name": "url", "type": str, - "default": f"http://127.0.0.1:{Ports.default.bucketfs}", + "default": f"http://127.0.0.1:{Ports.default_ports.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { From a52f5165afdaec56fc0ed7e2f73a9e4965cb8282 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 23 Jun 2023 08:47:44 +0200 Subject: [PATCH 05/57] fixed errors in pytest_plugin_itde_test.py --- test/unit/pytest_plugin_itde_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/pytest_plugin_itde_test.py b/test/unit/pytest_plugin_itde_test.py index 551879171..0c3c541d6 100644 --- a/test/unit/pytest_plugin_itde_test.py +++ b/test/unit/pytest_plugin_itde_test.py @@ -88,7 +88,7 @@ def test_test_schema_parser(definition, expected): { "name": "port", "type": int, - "default": Ports.default.database, + "default": Ports.default_ports.database, "help_text": "Port on which the exasol db is listening", }, { @@ -109,7 +109,7 @@ def test_test_schema_parser(definition, expected): { "name": "url", "type": str, - "default": f"http://127.0.0.1:{Ports.default.bucketfs}", + "default": f"http://127.0.0.1:{Ports.default_ports.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { @@ -156,7 +156,7 @@ def test_option_group_prefix_property(group, expected): prefix="exasol", name="port", type=int, - default=Ports.default.database, + default=Ports.default_ports.database, help_text="Port on which the exasol db is listening", ), Option( From 4b166de4f7e693005e95f7596dcb30d841591cea Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 23 Jun 2023 09:44:00 +0200 Subject: [PATCH 06/57] Removed Exposed ports from files EXAConf --- docker_db_config_template/7.0.0/EXAConf | 2 -- docker_db_config_template/7.1.0/EXAConf | 2 -- docker_db_config_template/8.18.1/EXAConf | 4 +++- .../docker_db_config/7.0.0/EXAConf | 2 -- .../docker_db_config/7.0.1/EXAConf | 2 -- .../docker_db_config/7.0.10/EXAConf | 2 -- .../docker_db_config/7.0.11/EXAConf | 2 -- .../docker_db_config/7.0.12/EXAConf | 2 -- .../docker_db_config/7.0.13/EXAConf | 2 -- .../docker_db_config/7.0.14/EXAConf | 2 -- .../docker_db_config/7.0.15/EXAConf | 2 -- .../docker_db_config/7.0.16/EXAConf | 2 -- .../docker_db_config/7.0.17/EXAConf | 2 -- .../docker_db_config/7.0.18/EXAConf | 2 -- .../docker_db_config/7.0.19/EXAConf | 2 -- .../docker_db_config/7.0.2/EXAConf | 2 -- .../docker_db_config/7.0.20/EXAConf | 2 -- .../docker_db_config/7.0.3/EXAConf | 2 -- .../docker_db_config/7.0.4/EXAConf | 2 -- .../docker_db_config/7.0.6/EXAConf | 2 -- .../docker_db_config/7.0.7/EXAConf | 2 -- .../docker_db_config/7.0.8/EXAConf | 2 -- .../docker_db_config/7.0.9/EXAConf | 2 -- .../docker_db_config/7.1.0/EXAConf | 2 -- .../docker_db_config/7.1.1/EXAConf | 2 -- .../docker_db_config/7.1.10/EXAConf | 2 -- .../docker_db_config/7.1.11/EXAConf | 2 -- .../docker_db_config/7.1.12/EXAConf | 2 -- .../docker_db_config/7.1.13/EXAConf | 2 -- .../docker_db_config/7.1.14/EXAConf | 2 -- .../docker_db_config/7.1.15/EXAConf | 2 -- .../docker_db_config/7.1.16/EXAConf | 2 -- .../docker_db_config/7.1.17/EXAConf | 2 -- .../docker_db_config/7.1.2/EXAConf | 2 -- .../docker_db_config/7.1.3/EXAConf | 2 -- .../docker_db_config/7.1.4/EXAConf | 2 -- .../docker_db_config/7.1.5/EXAConf | 2 -- .../docker_db_config/7.1.6/EXAConf | 2 -- .../docker_db_config/7.1.7/EXAConf | 2 -- .../docker_db_config/7.1.8/EXAConf | 2 -- .../docker_db_config/7.1.9/EXAConf | 2 -- .../docker_db_config/8.18.1/EXAConf | 2 -- 42 files changed, 3 insertions(+), 83 deletions(-) diff --git a/docker_db_config_template/7.0.0/EXAConf b/docker_db_config_template/7.0.0/EXAConf index 6ec215c70..a001090bb 100644 --- a/docker_db_config_template/7.0.0/EXAConf +++ b/docker_db_config_template/7.0.0/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/docker_db_config_template/7.1.0/EXAConf b/docker_db_config_template/7.1.0/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/docker_db_config_template/7.1.0/EXAConf +++ b/docker_db_config_template/7.1.0/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/docker_db_config_template/8.18.1/EXAConf b/docker_db_config_template/8.18.1/EXAConf index 04f5f986e..9296cb54c 100644 --- a/docker_db_config_template/8.18.1/EXAConf +++ b/docker_db_config_template/8.18.1/EXAConf @@ -104,8 +104,10 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 + # Commented out exposed ports as these are only used by + # https://github.com/exasol/docker-db/ # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 + # ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf index 6ec215c70..a001090bb 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf index ab78d47de..5fcaa8c2e 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf index 04f5f986e..0fbdb726d 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf @@ -104,8 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 From a4bbce013a00b865319c4b06a1d050926dfe6bf7 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 23 Jun 2023 09:49:28 +0200 Subject: [PATCH 07/57] reviewed and cleaned up references to class Port eitde/test/test_test_env_reuse.py uses Ports.random_free() now removed Ports.docker removed dead code and open questions --- .../lib/test_environment/ports.py | 19 ++----------------- .../test/test_test_env_reuse.py | 12 +++++------- pytest_itde/__init__.py | 4 ++-- test/unit/pytest_plugin_itde_test.py | 2 +- 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/ports.py b/exasol_integration_test_docker_environment/lib/test_environment/ports.py index 5f1c1ca30..a7506fc17 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/ports.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/ports.py @@ -30,32 +30,17 @@ class PortsType(type): The following properties are read-only class attributes: - default_ports - external - - docker - forward """ @property def default_ports(self) -> 'Ports': - # return Ports(database=8888, bucketfs=6583, ssh=22) return Ports(database=8563, bucketfs=2580, ssh=22) @property def external(self) -> 'Ports': - """ - Used by - eitde/test/test_test_env_reuse.py - eitde/cli/options/test_environment_options.py - """ - # return Ports(database=8563, bucketfs=6583, ssh=22) - return Ports(database=8563, bucketfs=2580, ssh=22) - - @property - def docker(self) -> 'Ports': - """ - Only used in pytest_itde/__init__.py - """ - # return Ports(database=8888, bucketfs=6583, ssh=22) - return Ports(database=8563, bucketfs=2580, ssh=22) + # For external databases SSH port might depend on version database. + return Ports(database=8563, bucketfs=2580, ssh=None) @property def forward(self) -> 'Ports': diff --git a/exasol_integration_test_docker_environment/test/test_test_env_reuse.py b/exasol_integration_test_docker_environment/test/test_test_env_reuse.py index bdfd5d7d8..b03c80156 100644 --- a/exasol_integration_test_docker_environment/test/test_test_env_reuse.py +++ b/exasol_integration_test_docker_environment/test/test_test_env_reuse.py @@ -10,8 +10,7 @@ from exasol_integration_test_docker_environment.testing import luigi_utils from exasol_integration_test_docker_environment.cli.options import test_environment_options from exasol_integration_test_docker_environment.testing.utils import check_db_version_from_env -from exasol_integration_test_docker_environment \ - .lib.test_environment.ports import Ports +from exasol_integration_test_docker_environment.lib.test_environment.ports import Ports class TestContainerReuseTest(unittest.TestCase): @@ -34,6 +33,7 @@ def setUp(self): self.docker_db_version_parameter = check_db_version_from_env() or test_environment_options.LATEST_DB_VERSION self.setup_luigi_config() + self.ports = Ports.random_free() def tearDown(self): luigi_utils.clean(self._docker_repository_name) @@ -49,17 +49,15 @@ def setup_luigi_config(self): def run_spawn_test_env(self, cleanup: bool): result = None - - ports = Ports.external task = generate_root_task(task_class=SpawnTestEnvironment, reuse_database_setup=True, reuse_database=True, reuse_test_container=True, no_test_container_cleanup_after_success=not cleanup, no_database_cleanup_after_success=not cleanup, - external_exasol_db_port=ports.database, - external_exasol_bucketfs_port=ports.bucketfs, - external_exasol_ssh_port=ports.ssh, + external_exasol_db_port=self.ports.database, + external_exasol_bucketfs_port=self.ports.bucketfs, + external_exasol_ssh_port=self.ports.ssh, external_exasol_xmlrpc_host="", external_exasol_db_host="", external_exasol_xmlrpc_port=0, diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index fac69b9eb..cc99711d5 100644 --- a/pytest_itde/__init__.py +++ b/pytest_itde/__init__.py @@ -19,7 +19,7 @@ { "name": "port", "type": int, - "default": Ports.docker.database, + "default": Ports.forward.database, "help_text": "Port on which the exasol db is listening", }, { @@ -43,7 +43,7 @@ { "name": "url", "type": str, - "default": f"http://127.0.0.1:{Ports.default_ports.bucketfs}", + "default": f"http://127.0.0.1:{Ports.forward.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { diff --git a/test/unit/pytest_plugin_itde_test.py b/test/unit/pytest_plugin_itde_test.py index 0c3c541d6..aa1e2236e 100644 --- a/test/unit/pytest_plugin_itde_test.py +++ b/test/unit/pytest_plugin_itde_test.py @@ -156,7 +156,7 @@ def test_option_group_prefix_property(group, expected): prefix="exasol", name="port", type=int, - default=Ports.default_ports.database, + default=8563, help_text="Port on which the exasol db is listening", ), Option( From 344f5159989ca37ba9512d8bbeb6abada0b873ee Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 23 Jun 2023 16:14:05 +0200 Subject: [PATCH 08/57] added ssh_port to all EXAConf templates and enhanced template substitution --- docker_db_config_template/7.0.0/EXAConf | 2 +- docker_db_config_template/7.1.0/EXAConf | 2 +- docker_db_config_template/8.17.0/EXAConf | 4 +--- docker_db_config_template/8.18.1/EXAConf | 2 +- .../docker_db_config/7.0.0/EXAConf | 2 +- .../docker_db_config/7.0.1/EXAConf | 2 +- .../docker_db_config/7.0.10/EXAConf | 2 +- .../docker_db_config/7.0.11/EXAConf | 2 +- .../docker_db_config/7.0.12/EXAConf | 2 +- .../docker_db_config/7.0.13/EXAConf | 2 +- .../docker_db_config/7.0.14/EXAConf | 2 +- .../docker_db_config/7.0.15/EXAConf | 2 +- .../docker_db_config/7.0.16/EXAConf | 2 +- .../docker_db_config/7.0.17/EXAConf | 2 +- .../docker_db_config/7.0.18/EXAConf | 2 +- .../docker_db_config/7.0.19/EXAConf | 2 +- .../docker_db_config/7.0.2/EXAConf | 2 +- .../docker_db_config/7.0.20/EXAConf | 2 +- .../docker_db_config/7.0.3/EXAConf | 2 +- .../docker_db_config/7.0.4/EXAConf | 2 +- .../docker_db_config/7.0.6/EXAConf | 2 +- .../docker_db_config/7.0.7/EXAConf | 2 +- .../docker_db_config/7.0.8/EXAConf | 2 +- .../docker_db_config/7.0.9/EXAConf | 2 +- .../docker_db_config/7.1.0/EXAConf | 2 +- .../docker_db_config/7.1.1/EXAConf | 2 +- .../docker_db_config/7.1.10/EXAConf | 2 +- .../docker_db_config/7.1.11/EXAConf | 2 +- .../docker_db_config/7.1.12/EXAConf | 2 +- .../docker_db_config/7.1.13/EXAConf | 2 +- .../docker_db_config/7.1.14/EXAConf | 2 +- .../docker_db_config/7.1.15/EXAConf | 2 +- .../docker_db_config/7.1.16/EXAConf | 2 +- .../docker_db_config/7.1.17/EXAConf | 2 +- .../docker_db_config/7.1.2/EXAConf | 2 +- .../docker_db_config/7.1.3/EXAConf | 2 +- .../docker_db_config/7.1.4/EXAConf | 2 +- .../docker_db_config/7.1.5/EXAConf | 2 +- .../docker_db_config/7.1.6/EXAConf | 2 +- .../docker_db_config/7.1.7/EXAConf | 2 +- .../docker_db_config/7.1.8/EXAConf | 2 +- .../docker_db_config/7.1.9/EXAConf | 2 +- .../docker_db_config/8.17.0/EXAConf | 4 +--- .../docker_db_config/8.18.1/EXAConf | 6 +++++- .../lib/test_environment/spawn_test_database.py | 1 + 45 files changed, 49 insertions(+), 48 deletions(-) diff --git a/docker_db_config_template/7.0.0/EXAConf b/docker_db_config_template/7.0.0/EXAConf index a001090bb..036e08bfc 100644 --- a/docker_db_config_template/7.0.0/EXAConf +++ b/docker_db_config_template/7.0.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/docker_db_config_template/7.1.0/EXAConf b/docker_db_config_template/7.1.0/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/docker_db_config_template/7.1.0/EXAConf +++ b/docker_db_config_template/7.1.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/docker_db_config_template/8.17.0/EXAConf b/docker_db_config_template/8.17.0/EXAConf index 4b1e330c1..e04288729 100644 --- a/docker_db_config_template/8.17.0/EXAConf +++ b/docker_db_config_template/8.17.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.exasol_license CoredPort = 325 - SSHPort = 22 + SSHPort = {{ ssh_port }} IssueTracker = Jira XMLRPCPort = 443 WebUIBackendPort = 4444 @@ -104,8 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/docker_db_config_template/8.18.1/EXAConf b/docker_db_config_template/8.18.1/EXAConf index 9296cb54c..ceabff64f 100644 --- a/docker_db_config_template/8.18.1/EXAConf +++ b/docker_db_config_template/8.18.1/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.exasol_license CoredPort = 325 - SSHPort = 22 + SSHPort = {{ ssh_port }} IssueTracker = Jira XMLRPCPort = 443 WebUIBackendPort = 4444 diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.14/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.15/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.16/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.17/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.18/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.19/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.2/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.20/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.3/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.4/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.6/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.7/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.8/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf index a001090bb..036e08bfc 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.0.9/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ # List of networks for this cluster: 'private' is mandatory, 'public' is optional. diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.1/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.10/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.11/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.12/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.13/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.14/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.15/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.16/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.17/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.2/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.3/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.4/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.5/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.6/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.7/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.8/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf index 5fcaa8c2e..420c8a2cd 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/7.1.9/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.xml CoredPort = 10001 - SSHPort = 22 + SSHPort = {{ ssh_port }} XMLRPCPort = 443 WebUIBackendPort = 4444 WebUIDomain = exacluster.local diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf index 4b1e330c1..e04288729 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.exasol_license CoredPort = 325 - SSHPort = 22 + SSHPort = {{ ssh_port }} IssueTracker = Jira XMLRPCPort = 443 WebUIBackendPort = 4444 @@ -104,8 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf index 0fbdb726d..ceabff64f 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf @@ -5,7 +5,7 @@ Platform = Docker LicenseFile = /exa/etc/license.exasol_license CoredPort = 325 - SSHPort = 22 + SSHPort = {{ ssh_port }} IssueTracker = Jira XMLRPCPort = 443 WebUIBackendPort = 4444 @@ -104,6 +104,10 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 + # Commented out exposed ports as these are only used by + # https://github.com/exasol/docker-db/ + # Ports to be exposed (container : host) + # ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 1b1dad8bc..370070e65 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -330,6 +330,7 @@ def _add_exa_conf( rendered_template = template.render(private_network=db_private_network, db_version=str(self.db_version), db_port=self.ports.database, + ssh_port=self.ports.ssh, bucketfs_port=self.ports.bucketfs, image_version=self.docker_db_image_version, mem_size=self.mem_size, From 37a2f592063d13a69e91e44e4d095cf427140bf0 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 26 Jun 2023 10:05:55 +0200 Subject: [PATCH 09/57] Fixed review findings --- .../test_environment/spawn_test_database.py | 16 +++++------ pytest_itde/__init__.py | 28 +++++++++++++++---- pytest_itde/config.py | 7 +++++ 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 370070e65..371a85a89 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -64,7 +64,7 @@ def __init__(self, *args, **kwargs): self.db_version = DbVersion.from_db_version_str(self.docker_db_image_version) self.docker_db_config_resource_name = f"docker_db_config/{self.db_version}" - self.ports = Ports.default_ports + self.internal_ports = Ports.default_ports def run_task(self): subnet = netaddr.IPNetwork(self.network_info.subnet) @@ -121,12 +121,12 @@ def _connect_docker_network( def _port_mappings(self): result = {} if self.database_port_forward is not None: - result[f"{self.ports.database}/tcp"] = ('0.0.0.0', int(self.database_port_forward)) + result[f"{self.internal_ports.database}/tcp"] = ('0.0.0.0', int(self.database_port_forward)) if self.bucketfs_port_forward is not None: - result[f"{self.ports.bucketfs}/tcp"] = ('0.0.0.0', int(self.bucketfs_port_forward)) + result[f"{self.internal_ports.bucketfs}/tcp"] = ('0.0.0.0', int(self.bucketfs_port_forward)) if self.ssh_port_forward is None: self.ssh_port_forward = find_free_ports(1)[0] - result[f"{self.ports.ssh}/tcp"] = ('0.0.0.0', int(self.ssh_port_forward)) + result[f"{self.internal_ports.ssh}/tcp"] = ('0.0.0.0', int(self.ssh_port_forward)) return result def _create_database_container(self, db_ip_address: str, db_private_network: str): @@ -196,7 +196,7 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf ssh_info = SshInfo(self.ssh_user, self.ssh_port_forward, self.ssh_key_file) database_info = DatabaseInfo( host=db_ip_address, - ports=self.ports, + ports=self.internal_ports, reused=reused, container_info=container_info, ssh_info=ssh_info, @@ -329,9 +329,9 @@ def _add_exa_conf( additional_db_parameter_str = " ".join(self.additional_db_parameter) rendered_template = template.render(private_network=db_private_network, db_version=str(self.db_version), - db_port=self.ports.database, - ssh_port=self.ports.ssh, - bucketfs_port=self.ports.bucketfs, + db_port=self.internal_ports.database, + ssh_port=self.internal_ports.ssh, + bucketfs_port=self.internal_ports.bucketfs, image_version=self.docker_db_image_version, mem_size=self.mem_size, disk_size=self.disk_size, diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index cc99711d5..c6eaf0bea 100644 --- a/pytest_itde/__init__.py +++ b/pytest_itde/__init__.py @@ -61,6 +61,17 @@ ), ) +SSH = config.OptionGroup( + prefix="ssh", + options=( + { + "name": "port", + "type": int, + "default": Ports.forward.ssh, + "help_text": "Port on which external processes can access the database via SSH protocol", + }, + ), +) def TestSchemas(value) -> Tuple[str]: """ @@ -116,6 +127,14 @@ def bucketfs_config(request) -> config.BucketFs: return config.BucketFs(**kwargs) +@pytest.fixture(scope="session") +def ssh_config(request) -> config.Ssh: + """Returns the configuration settings for SSH access in this session.""" + cli_arguments = request.config.option + kwargs = SSH.kwargs(os.environ, cli_arguments) + return config.Ssh(**kwargs) + + @pytest.fixture(scope="session") def itde_config(request) -> config.Itde: """Returns the configuration settings of the ITDE for this session.""" @@ -156,7 +175,7 @@ def _bootstrap_db(itde_config, exasol_config, bucketfs_config): def nop(): pass - def start_db(name, itde, exasol, bucketfs): + def start_db(name, itde, exasol, bucketfs, ssh_access): from urllib.parse import urlparse from exasol_integration_test_docker_environment.lib import api @@ -166,8 +185,7 @@ def start_db(name, itde, exasol, bucketfs): environment_name=name, database_port_forward=exasol.port, bucketfs_port_forward=bucketfs_url.port, - # should this rather be passed as a parameter to _bootstrap_db()? - ssh_port_forward=Ports.forward.ssh, + ssh_port_forward=ssh_access.port, db_mem_size="4GB", docker_db_image_version=itde.db_version, ) @@ -177,7 +195,7 @@ def start_db(name, itde, exasol, bucketfs): bootstrap_db = itde_config.db_version != "external" start = ( - lambda: start_db(db_name, itde_config, exasol_config, bucketfs_config) + lambda: start_db(db_name, itde_config, exasol_config, bucketfs_config, ssh_config) if bootstrap_db else lambda: nop ) @@ -214,7 +232,7 @@ def itde( connection.commit() -OPTION_GROUPS = (EXASOL, BUCKETFS, ITDE) +OPTION_GROUPS = (EXASOL, BUCKETFS, ITDE, SSH) def _add_option_group(parser, group): diff --git a/pytest_itde/config.py b/pytest_itde/config.py index a29ac3a59..faa00e402 100644 --- a/pytest_itde/config.py +++ b/pytest_itde/config.py @@ -121,6 +121,13 @@ class BucketFs: password: str +@dataclass +class Ssh: + """SSH configuration""" + + port: int + + @dataclass class Itde: """Itde configuration settings""" From fcd251a6cfbd384222e7c06951423638b6143008 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 26 Jun 2023 15:59:22 +0200 Subject: [PATCH 10/57] Added forwarded ports to DatabaseInfo --- .../lib/data/database_info.py | 2 ++ .../test_environment/spawn_test_database.py | 8 +++--- .../testing/api_test_environment.py | 27 ++++++++++--------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/data/database_info.py b/exasol_integration_test_docker_environment/lib/data/database_info.py index 47c9f0d0e..0816934d3 100644 --- a/exasol_integration_test_docker_environment/lib/data/database_info.py +++ b/exasol_integration_test_docker_environment/lib/data/database_info.py @@ -12,9 +12,11 @@ def __init__( reused: bool, container_info: ContainerInfo = None, ssh_info: SshInfo = None, + port_forwards: Ports = None, ): self.container_info = container_info self.ports = ports self.host = host self.reused = reused self.ssh_info = ssh_info + self.port_forwards = port_forwards diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 371a85a89..94c6ca55b 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -65,6 +65,7 @@ def __init__(self, *args, **kwargs): self.db_version = DbVersion.from_db_version_str(self.docker_db_image_version) self.docker_db_config_resource_name = f"docker_db_config/{self.db_version}" self.internal_ports = Ports.default_ports + self.port_forwards = None def run_task(self): subnet = netaddr.IPNetwork(self.network_info.subnet) @@ -159,7 +160,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): docker_db_image_info, ) - port_mappings = self._port_mappings() + self.port_forwards = self._port_mappings() volumes = {db_volume.name: {"bind": "/exa", "mode": "rw"}} if self.certificate_volume_name is not None: volumes[self.certificate_volume_name] = {"bind": CERTIFICATES_MOUNT_DIR, "mode": "ro"} @@ -171,7 +172,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): privileged=True, volumes=volumes, network_mode=None, - ports=port_mappings, + ports=self.port_forwards, runtime=self.docker_runtime ) enable_ssh_access(db_container, authorized_keys) @@ -196,10 +197,11 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf ssh_info = SshInfo(self.ssh_user, self.ssh_port_forward, self.ssh_key_file) database_info = DatabaseInfo( host=db_ip_address, - ports=self.internal_ports, + ports=self.ports, reused=reused, container_info=container_info, ssh_info=ssh_info, + port_forwards=self.port_forwards, ) return database_info diff --git a/exasol_integration_test_docker_environment/testing/api_test_environment.py b/exasol_integration_test_docker_environment/testing/api_test_environment.py index bdcac81fe..b19ef8aff 100644 --- a/exasol_integration_test_docker_environment/testing/api_test_environment.py +++ b/exasol_integration_test_docker_environment/testing/api_test_environment.py @@ -58,27 +58,28 @@ def _get_default_test_environment(self, name: str, ports: Ports): ports=ports, ) - def spawn_docker_test_environment_with_test_container(self, name: str, - test_container_content: TestContainerContentDescription, - additional_parameter: Dict[str, Any] = None) \ - -> ExaslctDockerTestEnvironment: + def spawn_docker_test_environment_with_test_container( + self, + name: str, + test_container_content: TestContainerContentDescription, + additional_parameter: Dict[str, Any] = None, + ) -> ExaslctDockerTestEnvironment: if additional_parameter is None: additional_parameter = dict() ports = Ports.random_free() - on_host_parameter = self._get_default_test_environment(name, ports) - docker_db_image_version = on_host_parameter.docker_db_image_version - ports = on_host_parameter.ports - on_host_parameter.environment_info, on_host_parameter.clean_up = \ + on_host = self._get_default_test_environment(name, ports) + docker_db_image_version = on_host.docker_db_image_version + on_host.environment_info, on_host.clean_up = \ spawn_test_environment_with_test_container( - environment_name=on_host_parameter.name, - database_port_forward=None if ports is None else ports.database, - bucketfs_port_forward=None if ports is None else ports.bucketfs, - ssh_port_forward=None if ports is None else ports.ssh, + environment_name=on_host.name, + database_port_forward=ports.database, + bucketfs_port_forward=ports.bucketfs, + ssh_port_forward=ports.ssh, docker_db_image_version=docker_db_image_version, test_container_content=test_container_content, **additional_parameter, ) - return on_host_parameter + return on_host def spawn_docker_test_environment( self, From adbfd093c399c249af51887d508bc1dffc7a2a8c Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 26 Jun 2023 16:12:58 +0200 Subject: [PATCH 11/57] Removed port from ShInfo ssh port is already available in DatabaseInfo.ports.ssh --- .../lib/data/ssh_info.py | 3 +-- .../lib/test_environment/spawn_test_database.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/data/ssh_info.py b/exasol_integration_test_docker_environment/lib/data/ssh_info.py index 5786c9c31..7db0da6a2 100644 --- a/exasol_integration_test_docker_environment/lib/data/ssh_info.py +++ b/exasol_integration_test_docker_environment/lib/data/ssh_info.py @@ -2,7 +2,6 @@ class SshInfo: """ key_file contains path to the file containing the private key for SSH access. """ - def __init__(self, user: str, port: int, key_file: str): + def __init__(self, user: str, key_file: str): self.user = user - self.port = port self.key_file = key_file diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 94c6ca55b..fc03ddccf 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -194,7 +194,7 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf network_info=self.network_info, volume_name=self._get_db_volume_name(), ) - ssh_info = SshInfo(self.ssh_user, self.ssh_port_forward, self.ssh_key_file) + ssh_info = SshInfo(self.ssh_user, self.ssh_key_file) database_info = DatabaseInfo( host=db_ip_address, ports=self.ports, From 82861fbbf33c549e296f808937f4c3916945f65e Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 26 Jun 2023 17:24:04 +0200 Subject: [PATCH 12/57] fixed Test --- .../lib/test_environment/spawn_test_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index fc03ddccf..55a4fb2f2 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -197,7 +197,7 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf ssh_info = SshInfo(self.ssh_user, self.ssh_key_file) database_info = DatabaseInfo( host=db_ip_address, - ports=self.ports, + ports=self.internal_ports, reused=reused, container_info=container_info, ssh_info=ssh_info, From 7f8ad188594aab3dcdede44446bab8ca4e3c19fb Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 27 Jun 2023 07:24:51 +0200 Subject: [PATCH 13/57] fixed test/integration/pytest_itde_test.py --- pytest_itde/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index c6eaf0bea..50a9c7ddb 100644 --- a/pytest_itde/__init__.py +++ b/pytest_itde/__init__.py @@ -169,7 +169,7 @@ def factory(config: config.Exasol): @pytest.fixture(scope="session") -def _bootstrap_db(itde_config, exasol_config, bucketfs_config): +def _bootstrap_db(itde_config, exasol_config, bucketfs_config, ssh_config): """Bootstraps the database should not be used from outside the itde plugin.""" def nop(): From 8fb0b086e09166836c03b66d6c6ab7eb5785aa63 Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 27 Jun 2023 10:45:42 +0200 Subject: [PATCH 14/57] Fixed review findings --- .../lib/data/database_info.py | 4 +- .../test_environment/spawn_test_database.py | 46 +++++++++++++------ .../testing/api_test_environment.py | 10 ++-- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/data/database_info.py b/exasol_integration_test_docker_environment/lib/data/database_info.py index 0816934d3..5d08f903d 100644 --- a/exasol_integration_test_docker_environment/lib/data/database_info.py +++ b/exasol_integration_test_docker_environment/lib/data/database_info.py @@ -12,11 +12,11 @@ def __init__( reused: bool, container_info: ContainerInfo = None, ssh_info: SshInfo = None, - port_forwards: Ports = None, + forwarded_ports: Ports = None, ): self.container_info = container_info self.ports = ports self.host = host self.reused = reused self.ssh_info = ssh_info - self.port_forwards = port_forwards + self.forwarded_ports = forwarded_ports diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 55a4fb2f2..231f017e8 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -65,7 +65,6 @@ def __init__(self, *args, **kwargs): self.db_version = DbVersion.from_db_version_str(self.docker_db_image_version) self.docker_db_config_resource_name = f"docker_db_config/{self.db_version}" self.internal_ports = Ports.default_ports - self.port_forwards = None def run_task(self): subnet = netaddr.IPNetwork(self.network_info.subnet) @@ -84,7 +83,11 @@ def _try_to_reuse_database(self, db_ip_address: str) -> DatabaseInfo: database_info = None ssh_key = self._get_ssh_key() try: - database_info = self._create_database_info(db_ip_address=db_ip_address, reused=True) + database_info = self._create_database_info( + db_ip_address=db_ip_address, + forwarded_ports=None, + reused=True, + ) except Exception as e: self.logger.warning("Tried to reuse database container %s, but got Exeception %s. " "Fallback to create new database.", self.db_container_name, e) @@ -119,15 +122,12 @@ def _connect_docker_network( aliases = self._get_network_aliases() network.connect(container, ipv4_address=ip_address, aliases=aliases) - def _port_mappings(self): + def _port_mapping(self, internal: Ports, forwards: Ports): result = {} - if self.database_port_forward is not None: - result[f"{self.internal_ports.database}/tcp"] = ('0.0.0.0', int(self.database_port_forward)) - if self.bucketfs_port_forward is not None: - result[f"{self.internal_ports.bucketfs}/tcp"] = ('0.0.0.0', int(self.bucketfs_port_forward)) - if self.ssh_port_forward is None: - self.ssh_port_forward = find_free_ports(1)[0] - result[f"{self.internal_ports.ssh}/tcp"] = ('0.0.0.0', int(self.ssh_port_forward)) + for name in ("database", "bucketfs", "ssh"): + port = internal.__getattribute__(name) + forward = forwards.__getattribute__(name) + result[f"{port}/tcp"] = ('0.0.0.0', forward) return result def _create_database_container(self, db_ip_address: str, db_private_network: str): @@ -160,7 +160,14 @@ def enable_ssh_access(container: Container, authorized_keys: str): docker_db_image_info, ) - self.port_forwards = self._port_mappings() + if self.ssh_port_forward is None: + self.ssh_port_forward = str(find_free_ports(1)[0]) + forwarded_ports = Ports( + database=int(self.database_port_forward), + bucketfs=int(self.bucketfs_port_forward), + ssh=int(self.ssh_port_forward), + ) + port_mapping = self._port_mapping(self.internal_ports, forwarded_ports) volumes = {db_volume.name: {"bind": "/exa", "mode": "rw"}} if self.certificate_volume_name is not None: volumes[self.certificate_volume_name] = {"bind": CERTIFICATES_MOUNT_DIR, "mode": "ro"} @@ -172,16 +179,25 @@ def enable_ssh_access(container: Container, authorized_keys: str): privileged=True, volumes=volumes, network_mode=None, - ports=self.port_forwards, + ports=port_mapping, runtime=self.docker_runtime ) enable_ssh_access(db_container, authorized_keys) self._connect_docker_network(docker_client, db_container, db_ip_address) db_container.start() - database_info = self._create_database_info(db_ip_address=db_ip_address, reused=False) + database_info = self._create_database_info( + db_ip_address=db_ip_address, + forwarded_ports=forwarded_ports, + reused=False, + ) return database_info - def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInfo: + def _create_database_info( + self, + db_ip_address: str, + forwarded_ports: Ports, + reused: bool, + ) -> DatabaseInfo: with self._get_docker_client() as docker_client: db_container = docker_client.containers.get(self.db_container_name) if db_container.status != "running": @@ -201,7 +217,7 @@ def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInf reused=reused, container_info=container_info, ssh_info=ssh_info, - port_forwards=self.port_forwards, + forwarded_ports=forwarded_ports, ) return database_info diff --git a/exasol_integration_test_docker_environment/testing/api_test_environment.py b/exasol_integration_test_docker_environment/testing/api_test_environment.py index b19ef8aff..ac2eb95b4 100644 --- a/exasol_integration_test_docker_environment/testing/api_test_environment.py +++ b/exasol_integration_test_docker_environment/testing/api_test_environment.py @@ -67,11 +67,11 @@ def spawn_docker_test_environment_with_test_container( if additional_parameter is None: additional_parameter = dict() ports = Ports.random_free() - on_host = self._get_default_test_environment(name, ports) - docker_db_image_version = on_host.docker_db_image_version - on_host.environment_info, on_host.clean_up = \ + on_host_parameter = self._get_default_test_environment(name, ports) + docker_db_image_version = on_host_parameter.docker_db_image_version + on_host_parameter.environment_info, on_host_parameter.clean_up = \ spawn_test_environment_with_test_container( - environment_name=on_host.name, + environment_name=on_host_parameter.name, database_port_forward=ports.database, bucketfs_port_forward=ports.bucketfs, ssh_port_forward=ports.ssh, @@ -79,7 +79,7 @@ def spawn_docker_test_environment_with_test_container( test_container_content=test_container_content, **additional_parameter, ) - return on_host + return on_host_parameter def spawn_docker_test_environment( self, From 282b979af547b8d596b0edc7300ed4bba7eba47f Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 27 Jun 2023 13:39:48 +0200 Subject: [PATCH 15/57] Fixed tests --- .../test_environment/spawn_test_database.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index 231f017e8..f13ff8e2e 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -1,5 +1,5 @@ import math -from typing import Tuple +from typing import Optional, Tuple import docker import humanfriendly @@ -122,12 +122,12 @@ def _connect_docker_network( aliases = self._get_network_aliases() network.connect(container, ipv4_address=ip_address, aliases=aliases) - def _port_mapping(self, internal: Ports, forwards: Ports): + def _port_mapping(self, internal_ports, forwarded_ports): result = {} - for name in ("database", "bucketfs", "ssh"): - port = internal.__getattribute__(name) - forward = forwards.__getattribute__(name) - result[f"{port}/tcp"] = ('0.0.0.0', forward) + for name, internal in internal_ports.__dict__.items(): + forward = forwarded_ports.__getattribute__(name) + if forward: + result[f"{internal}/tcp"] = ('0.0.0.0', forward) return result def _create_database_container(self, db_ip_address: str, db_private_network: str): @@ -162,10 +162,14 @@ def enable_ssh_access(container: Container, authorized_keys: str): if self.ssh_port_forward is None: self.ssh_port_forward = str(find_free_ports(1)[0]) + + def port_or_none(spec: str) -> Optional[int]: + return None if spec is None else int(spec) + forwarded_ports = Ports( - database=int(self.database_port_forward), - bucketfs=int(self.bucketfs_port_forward), - ssh=int(self.ssh_port_forward), + database=port_or_none(self.database_port_forward), + bucketfs=port_or_none(self.bucketfs_port_forward), + ssh=port_or_none(self.ssh_port_forward), ) port_mapping = self._port_mapping(self.internal_ports, forwarded_ports) volumes = {db_volume.name: {"bind": "/exa", "mode": "rw"}} From 4b4679f6a6f94292b5f39a032a3e0f3554f37ac1 Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 27 Jun 2023 14:56:26 +0200 Subject: [PATCH 16/57] made moved forwarded port an attribute of class SpawnTestDockerDatabase --- .../test_environment/spawn_test_database.py | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py index f13ff8e2e..260a02a57 100644 --- a/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py +++ b/exasol_integration_test_docker_environment/lib/test_environment/spawn_test_database.py @@ -43,6 +43,10 @@ CERTIFICATES_DEFAULT_DIR = "/exa/etc/ssl/" +def int_or_none(value: str) -> Optional[int]: + return None if value is None else int(value) + + class SpawnTestDockerDatabase(DockerBaseTask, DockerDBTestEnvironmentParameter): environment_name = luigi.Parameter() # type: str db_container_name = luigi.Parameter() # type: str @@ -65,6 +69,13 @@ def __init__(self, *args, **kwargs): self.db_version = DbVersion.from_db_version_str(self.docker_db_image_version) self.docker_db_config_resource_name = f"docker_db_config/{self.db_version}" self.internal_ports = Ports.default_ports + if self.ssh_port_forward is None: + self.ssh_port_forward = str(find_free_ports(1)[0]) + self.forwarded_ports = Ports( + database=int_or_none(self.database_port_forward), + bucketfs=int_or_none(self.bucketfs_port_forward), + ssh=int_or_none(self.ssh_port_forward), + ) def run_task(self): subnet = netaddr.IPNetwork(self.network_info.subnet) @@ -83,11 +94,7 @@ def _try_to_reuse_database(self, db_ip_address: str) -> DatabaseInfo: database_info = None ssh_key = self._get_ssh_key() try: - database_info = self._create_database_info( - db_ip_address=db_ip_address, - forwarded_ports=None, - reused=True, - ) + database_info = self._create_database_info(db_ip_address=db_ip_address, reused=True) except Exception as e: self.logger.warning("Tried to reuse database container %s, but got Exeception %s. " "Fallback to create new database.", self.db_container_name, e) @@ -159,19 +166,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): authorized_keys, docker_db_image_info, ) - - if self.ssh_port_forward is None: - self.ssh_port_forward = str(find_free_ports(1)[0]) - - def port_or_none(spec: str) -> Optional[int]: - return None if spec is None else int(spec) - - forwarded_ports = Ports( - database=port_or_none(self.database_port_forward), - bucketfs=port_or_none(self.bucketfs_port_forward), - ssh=port_or_none(self.ssh_port_forward), - ) - port_mapping = self._port_mapping(self.internal_ports, forwarded_ports) + port_mapping = self._port_mapping(self.internal_ports, self.forwarded_ports) volumes = {db_volume.name: {"bind": "/exa", "mode": "rw"}} if self.certificate_volume_name is not None: volumes[self.certificate_volume_name] = {"bind": CERTIFICATES_MOUNT_DIR, "mode": "ro"} @@ -189,19 +184,10 @@ def port_or_none(spec: str) -> Optional[int]: enable_ssh_access(db_container, authorized_keys) self._connect_docker_network(docker_client, db_container, db_ip_address) db_container.start() - database_info = self._create_database_info( - db_ip_address=db_ip_address, - forwarded_ports=forwarded_ports, - reused=False, - ) + database_info = self._create_database_info(db_ip_address=db_ip_address, reused=False) return database_info - def _create_database_info( - self, - db_ip_address: str, - forwarded_ports: Ports, - reused: bool, - ) -> DatabaseInfo: + def _create_database_info(self, db_ip_address: str, reused: bool) -> DatabaseInfo: with self._get_docker_client() as docker_client: db_container = docker_client.containers.get(self.db_container_name) if db_container.status != "running": @@ -221,7 +207,7 @@ def _create_database_info( reused=reused, container_info=container_info, ssh_info=ssh_info, - forwarded_ports=forwarded_ports, + forwarded_ports=self.forwarded_ports, ) return database_info From ec773f1598c209323a6f49deb17105ad971ed3b0 Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 27 Jun 2023 14:47:03 +0100 Subject: [PATCH 17/57] [run all tests] From 5415844b4f76b2b7190fddf999406e7c682f30d3 Mon Sep 17 00:00:00 2001 From: Torsten Kilias Date: Wed, 28 Jun 2023 12:54:56 +0200 Subject: [PATCH 18/57] Use EXASOL_VERSION in pytest_itde_test.py [run all tests] --- test/integration/pytest_itde_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index e1f3833fc..d5c0748ed 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -1,3 +1,4 @@ +import os from inspect import cleandoc from itertools import chain @@ -35,7 +36,11 @@ def test_itde_smoke_test(itde): ) def test_itde_smoke_test(make_test_files, pytester, files): make_test_files(pytester, files) - result = pytester.runpytest() + cmdargs = {} + if "EXASOL_VERSION" in os.environ: + cmdargs = {"--itde-db-version": os.environ["EXASOL_VERSION"]} + args = chain.from_iterable(cmdargs.items()) + result = pytester.runpytest(*args) assert result.ret == pytest.ExitCode.OK From c6d4243ea2a92960fc02c669eeff681b445d6cf4 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 09:44:38 +0200 Subject: [PATCH 19/57] set log level for debugging purposes --- noxfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index bcd7b9f92..3f0e5e77f 100644 --- a/noxfile.py +++ b/noxfile.py @@ -183,10 +183,11 @@ def run_tests(session: nox.Session, db_version: str): "./exasol_integration_test_docker_environment/test", env=env, ) + session.run("pytest", '--log-level=DEBUG', './test/unit') session.run( - "pytest", "--itde-db-version", db_version, './test/integration' + "pytest", '--log-level=DEBUG', + "--itde-db-version", db_version, './test/integration/pytest_itde_test.py' ) - session.run("pytest", './test/unit') @nox.session(name="run-minimal-tests", python=False) From a121b610189cbfbc639c4e5f796a0e43b6331fa7 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 09:49:05 +0200 Subject: [PATCH 20/57] [run all tests] --- noxfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 3f0e5e77f..38f15bc6b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -183,9 +183,10 @@ def run_tests(session: nox.Session, db_version: str): "./exasol_integration_test_docker_environment/test", env=env, ) - session.run("pytest", '--log-level=DEBUG', './test/unit') + session.run("pytest", "-s", '--log-level=DEBUG', './test/unit') session.run( "pytest", '--log-level=DEBUG', + "-s", "--itde-db-version", db_version, './test/integration/pytest_itde_test.py' ) From 35103c890a2f979a415b5735078f838384fc0de4 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:40:26 +0200 Subject: [PATCH 21/57] added workflow for manual experiments --- .github/workflows/test_only_8.17.0.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml new file mode 100644 index 000000000..22c2043a2 --- /dev/null +++ b/.github/workflows/test_only_8.17.0.yml @@ -0,0 +1,11 @@ +name: Run test 8.17.0 + +jobs: + run-test-8.17.0: + runs-on: ubuntu-latest + name: Run test 8.17.0 + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/prepare_poetry_env + - name: Run test 8.17.0 + run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" From 09b11ba961cec3330ceb590761de965e04a196ce Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:43:01 +0200 Subject: [PATCH 22/57] added on: workflow_dispatch: --- .github/workflows/test_only_8.17.0.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 22c2043a2..e53a42747 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -1,5 +1,9 @@ name: Run test 8.17.0 +on: + workflow_dispatch: + pull-request: + jobs: run-test-8.17.0: runs-on: ubuntu-latest From d0699d42fbc3818fe7f8c3619a673bb4423aecdd Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:46:15 +0200 Subject: [PATCH 23/57] fixed workflow --- .github/workflows/test_only_8.17.0.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index e53a42747..33ffad1ff 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -2,7 +2,7 @@ name: Run test 8.17.0 on: workflow_dispatch: - pull-request: + pull_request: jobs: run-test-8.17.0: @@ -10,6 +10,8 @@ jobs: name: Run test 8.17.0 steps: - uses: actions/checkout@v3 + - uses: ./.github/actions/prepare_poetry_env + - name: Run test 8.17.0 run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" From f438803046fd68d704d99e0f1850d1bb97317102 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:47:08 +0200 Subject: [PATCH 24/57] fixed id of workflow --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 33ffad1ff..ce9a99d23 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -5,7 +5,7 @@ on: pull_request: jobs: - run-test-8.17.0: + build: runs-on: ubuntu-latest name: Run test 8.17.0 steps: From dc3c30242ea07632e7be5457cf1e2386cadd9954 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:49:22 +0200 Subject: [PATCH 25/57] simplified workflow --- .github/workflows/test_only_8.17.0.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index ce9a99d23..ef15a1ca3 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -14,4 +14,6 @@ jobs: - uses: ./.github/actions/prepare_poetry_env - name: Run test 8.17.0 - run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + run: poetry run pytest -s test/integration/pytest_itde_test.py + env: + EXASOL_VERSION: "prerelease-8.17.0" From 93c22a38537f77a7189ec55f227ed325264c604a Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 12:52:26 +0200 Subject: [PATCH 26/57] added --log-debug=DEBUG --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index ef15a1ca3..5b357ed25 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -14,6 +14,6 @@ jobs: - uses: ./.github/actions/prepare_poetry_env - name: Run test 8.17.0 - run: poetry run pytest -s test/integration/pytest_itde_test.py + run: poetry run pytest --log-debug=DEBUG -s test/integration/pytest_itde_test.py env: EXASOL_VERSION: "prerelease-8.17.0" From 5e755177290d9f60ea76c70ba3a104729b93fc53 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 13:07:52 +0200 Subject: [PATCH 27/57] reverted test workflow file --- .github/workflows/test_only_8.17.0.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 5b357ed25..462b1dc8c 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -14,6 +14,7 @@ jobs: - uses: ./.github/actions/prepare_poetry_env - name: Run test 8.17.0 - run: poetry run pytest --log-debug=DEBUG -s test/integration/pytest_itde_test.py - env: - EXASOL_VERSION: "prerelease-8.17.0" + # run: poetry run pytest --log-debug=DEBUG -s test/integration/pytest_itde_test.py + poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + # env: + # EXASOL_VERSION: "prerelease-8.17.0" From 42727c828710b2934b9a32c44975efc7b6ee3995 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 13:09:50 +0200 Subject: [PATCH 28/57] x --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 462b1dc8c..3c5f1ff26 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -14,7 +14,7 @@ jobs: - uses: ./.github/actions/prepare_poetry_env - name: Run test 8.17.0 - # run: poetry run pytest --log-debug=DEBUG -s test/integration/pytest_itde_test.py + # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" # env: # EXASOL_VERSION: "prerelease-8.17.0" From 8a6a9560c4bba59ee85eab31679dbe6e5d74bc21 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 13:11:58 +0200 Subject: [PATCH 29/57] x --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 3c5f1ff26..1d02af294 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -15,6 +15,6 @@ jobs: - name: Run test 8.17.0 # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" # env: # EXASOL_VERSION: "prerelease-8.17.0" From e274d7533b4cf7879c61fc997e74019619c62c5d Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 13:27:17 +0200 Subject: [PATCH 30/57] y --- test/integration/pytest_itde_test.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index d5c0748ed..d39b2b2d3 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -44,6 +44,13 @@ def test_itde_smoke_test(make_test_files, pytester, files): assert result.ret == pytest.ExitCode.OK +@pytest.mark.skipif( + "EXASOL_VERSION" in os.environ and os.environ["EXASOL_VERSION"] != "8.18.0", + reason=""" + Test skipped for EXASOL versions other than 8.18.0 to avoid error + no space left on device due to multiple huge docker images downloaded. + """, +) @pytest.mark.parametrize( "files", [ From 835c7b6fde406a7543ea85078128c74dc7ce6b31 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 14:08:27 +0200 Subject: [PATCH 31/57] different approach to skip pytest_itde_tests for non-default version of Exasol database --- .github/workflows/test_only_8.17.0.yml | 2 +- test/integration/pytest_itde_test.py | 33 ++++++++++++++++---------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 1d02af294..bdc0fb5f5 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -15,6 +15,6 @@ jobs: - name: Run test 8.17.0 # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + # run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" # env: # EXASOL_VERSION: "prerelease-8.17.0" diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index d39b2b2d3..420422a6a 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -20,6 +20,13 @@ def _ids(params): return next(keys) +default_version = "8.18.1" +def is_default_version(): + return "EXASOL_VERSION" in os.environ \ + and os.environ["EXASOL_VERSION"] != default_version + + +@pytest.mark.skipif(not is_default_version()) @pytest.mark.slow @pytest.mark.parametrize( "files", @@ -36,20 +43,22 @@ def test_itde_smoke_test(itde): ) def test_itde_smoke_test(make_test_files, pytester, files): make_test_files(pytester, files) - cmdargs = {} - if "EXASOL_VERSION" in os.environ: - cmdargs = {"--itde-db-version": os.environ["EXASOL_VERSION"]} - args = chain.from_iterable(cmdargs.items()) - result = pytester.runpytest(*args) + # cmdargs = {} + # if "EXASOL_VERSION" in os.environ: + # cmdargs = {"--itde-db-version": os.environ["EXASOL_VERSION"]} + # args = chain.from_iterable(cmdargs.items()) + # result = pytester.runpytest(*args) + result = pytester.runpytest() assert result.ret == pytest.ExitCode.OK @pytest.mark.skipif( - "EXASOL_VERSION" in os.environ and os.environ["EXASOL_VERSION"] != "8.18.0", - reason=""" - Test skipped for EXASOL versions other than 8.18.0 to avoid error - no space left on device due to multiple huge docker images downloaded. - """, + not is_default_version(), + reason="""This test always uses default version of Exasol database. If + the current run of a matrix build uses a different version then executing + all tests requires to download two docker images in total. For Exasol + versions 8 and higher the size of the Docker Containers did drastically + increase which in turn causes error "no space left on device".""", ) @pytest.mark.parametrize( "files", @@ -77,9 +86,9 @@ def test_default_settings_of_bucketfs(bucketfs_config): }, { "test_itde_settings": cleandoc( - """ + f""" def test_default_settings_of_itde(itde_config): - assert itde_config.db_version == '8.18.1' + assert itde_config.db_version == '{default_version}' assert set(itde_config.schemas) == set(('TEST', 'TEST_SCHEMA')) """ ) From 28da851dfe93a93940b47f6d8ca5e5fb63332d8c Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 14:08:46 +0200 Subject: [PATCH 32/57] x --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index bdc0fb5f5..1d02af294 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -15,6 +15,6 @@ jobs: - name: Run test 8.17.0 # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - # run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" # env: # EXASOL_VERSION: "prerelease-8.17.0" From e8cafd473bb1158123a6b638264a71afa9a8b23c Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 14:14:43 +0200 Subject: [PATCH 33/57] refactored test skips --- test/integration/pytest_itde_test.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 420422a6a..7fa117b73 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -21,12 +21,16 @@ def _ids(params): default_version = "8.18.1" -def is_default_version(): - return "EXASOL_VERSION" in os.environ \ - and os.environ["EXASOL_VERSION"] != default_version - +default_version_only=pytest.mark.skipif( + "EXASOL_VERSION" in os.environ and os.environ["EXASOL_VERSION"] != default_version, + reason="""This test always uses default version of Exasol database. If + the current run of a matrix build uses a different version then executing + all tests requires to download two docker images in total. For Exasol + versions 8 and higher the size of the Docker Containers did drastically + increase which in turn causes error "no space left on device".""", +) -@pytest.mark.skipif(not is_default_version()) +@default_version_only @pytest.mark.slow @pytest.mark.parametrize( "files", @@ -52,14 +56,7 @@ def test_itde_smoke_test(make_test_files, pytester, files): assert result.ret == pytest.ExitCode.OK -@pytest.mark.skipif( - not is_default_version(), - reason="""This test always uses default version of Exasol database. If - the current run of a matrix build uses a different version then executing - all tests requires to download two docker images in total. For Exasol - versions 8 and higher the size of the Docker Containers did drastically - increase which in turn causes error "no space left on device".""", -) +@default_version_only @pytest.mark.parametrize( "files", [ From 9bfd3af9de7db39aeaa15c880a398ec6b4667ec4 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 15:05:10 +0200 Subject: [PATCH 34/57] changed noxfile --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index 38f15bc6b..8c74f4e95 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,8 +172,8 @@ def get_db_versions() -> List[str]: @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" + env = {"EXASOL_VERSION": db_version} with session.chdir(ROOT): - env = {"EXASOL_VERSION": db_version} session.run( "python", "-u", @@ -187,7 +187,7 @@ def run_tests(session: nox.Session, db_version: str): session.run( "pytest", '--log-level=DEBUG', "-s", - "--itde-db-version", db_version, './test/integration/pytest_itde_test.py' + './test/integration/pytest_itde_test.py' ) From ab3a5df6803d3b202b8442b142cba4d203d385c6 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 15:25:52 +0200 Subject: [PATCH 35/57] fixed noxfile.py --- noxfile.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index 8c74f4e95..9ff3ba1af 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,8 +172,8 @@ def get_db_versions() -> List[str]: @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" - env = {"EXASOL_VERSION": db_version} with session.chdir(ROOT): + env = {"EXASOL_VERSION": db_version} session.run( "python", "-u", @@ -184,11 +184,13 @@ def run_tests(session: nox.Session, db_version: str): env=env, ) session.run("pytest", "-s", '--log-level=DEBUG', './test/unit') - session.run( - "pytest", '--log-level=DEBUG', - "-s", - './test/integration/pytest_itde_test.py' - ) + # session.run( + # "pytest", '--log-level=DEBUG', + # "--itde-db-version", db_version, + # "-s", + # './test/integration/pytest_itde_test.py', + # env=env, + # ) @nox.session(name="run-minimal-tests", python=False) From ab1fcf84f2bc770a2c77a9b0590da8b0625dc995 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 16:21:35 +0200 Subject: [PATCH 36/57] CLeaned up tests --- .github/workflows/test_only_8.17.0.yml | 20 -------------------- noxfile.py | 12 ++++-------- test/integration/pytest_itde_test.py | 9 ++++----- 3 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml deleted file mode 100644 index 1d02af294..000000000 --- a/.github/workflows/test_only_8.17.0.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Run test 8.17.0 - -on: - workflow_dispatch: - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - name: Run test 8.17.0 - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/prepare_poetry_env - - - name: Run test 8.17.0 - # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" - # env: - # EXASOL_VERSION: "prerelease-8.17.0" diff --git a/noxfile.py b/noxfile.py index 9ff3ba1af..7e60a99e2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -183,14 +183,10 @@ def run_tests(session: nox.Session, db_version: str): "./exasol_integration_test_docker_environment/test", env=env, ) - session.run("pytest", "-s", '--log-level=DEBUG', './test/unit') - # session.run( - # "pytest", '--log-level=DEBUG', - # "--itde-db-version", db_version, - # "-s", - # './test/integration/pytest_itde_test.py', - # env=env, - # ) + session.run("pytest", "./test/unit") + session.run( + "pytest", "--itde-db-version", db_version, './test/integration' + ) @nox.session(name="run-minimal-tests", python=False) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 7fa117b73..093eb97c9 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -30,6 +30,10 @@ def _ids(params): increase which in turn causes error "no space left on device".""", ) +def test_pytest_param(): + print(f'pytest.config = {pytest.config}') + + @default_version_only @pytest.mark.slow @pytest.mark.parametrize( @@ -47,11 +51,6 @@ def test_itde_smoke_test(itde): ) def test_itde_smoke_test(make_test_files, pytester, files): make_test_files(pytester, files) - # cmdargs = {} - # if "EXASOL_VERSION" in os.environ: - # cmdargs = {"--itde-db-version": os.environ["EXASOL_VERSION"]} - # args = chain.from_iterable(cmdargs.items()) - # result = pytester.runpytest(*args) result = pytester.runpytest() assert result.ret == pytest.ExitCode.OK From d7e6c9d0deb2ce166c73c032e9739ea51a858174 Mon Sep 17 00:00:00 2001 From: KK Date: Thu, 29 Jun 2023 16:50:08 +0200 Subject: [PATCH 37/57] removed experimental test --- test/integration/pytest_itde_test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 093eb97c9..433dfca31 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -30,9 +30,6 @@ def _ids(params): increase which in turn causes error "no space left on device".""", ) -def test_pytest_param(): - print(f'pytest.config = {pytest.config}') - @default_version_only @pytest.mark.slow From cf67bebe96233077ad6f219f90629e622bde2587 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 08:11:32 +0100 Subject: [PATCH 38/57] [run all tests] From 820ce1bc7db7183a30bade486ecb577e3017932d Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 09:50:22 +0200 Subject: [PATCH 39/57] added env to noxfile --- .github/workflows/test_only_8.17.0.yml | 20 ++++++++++++++++++++ noxfile.py | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml new file mode 100644 index 000000000..1d02af294 --- /dev/null +++ b/.github/workflows/test_only_8.17.0.yml @@ -0,0 +1,20 @@ +name: Run test 8.17.0 + +on: + workflow_dispatch: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + name: Run test 8.17.0 + steps: + - uses: actions/checkout@v3 + + - uses: ./.github/actions/prepare_poetry_env + + - name: Run test 8.17.0 + # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py + run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + # env: + # EXASOL_VERSION: "prerelease-8.17.0" diff --git a/noxfile.py b/noxfile.py index 7e60a99e2..d07e37a70 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,8 +172,8 @@ def get_db_versions() -> List[str]: @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" + env = {"EXASOL_VERSION": db_version} with session.chdir(ROOT): - env = {"EXASOL_VERSION": db_version} session.run( "python", "-u", @@ -185,7 +185,10 @@ def run_tests(session: nox.Session, db_version: str): ) session.run("pytest", "./test/unit") session.run( - "pytest", "--itde-db-version", db_version, './test/integration' + "pytest", + "--itde-db-version", db_version, + './test/integration', + env=env, ) From 5d0c96a1162d2692eb17756057f7d9ab0cca0b20 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 11:06:13 +0200 Subject: [PATCH 40/57] experimental --- .github/workflows/test_only_8.17.0.yml | 2 +- noxfile.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 1d02af294..e3b125064 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -15,6 +15,6 @@ jobs: - name: Run test 8.17.0 # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - run: poetry run nox -s "run-tests(db_version='prerelease-8.17.0')" + run: poetry run nox -s "run-tests-experimental(db_version='prerelease-8.17.0')" # env: # EXASOL_VERSION: "prerelease-8.17.0" diff --git a/noxfile.py b/noxfile.py index d07e37a70..7bc15c201 100644 --- a/noxfile.py +++ b/noxfile.py @@ -168,6 +168,19 @@ def get_db_versions() -> List[str]: return db_versions +@nox.session(name="run-tests-experimental", python=False) +@nox.parametrize("db_version", get_db_versions()) +def run_tests_experimental(session: nox.Session, db_version: str): + """Run the tests in the poetry environment""" + env = {"EXASOL_VERSION": db_version} + session.run( + "pytest", + "--itde-db-version", db_version, + "./test/integration/pytest_itde_test.py", + env=env, + ) + + @nox.session(name="run-tests", python=False) @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): @@ -187,7 +200,7 @@ def run_tests(session: nox.Session, db_version: str): session.run( "pytest", "--itde-db-version", db_version, - './test/integration', + "./test/integration", env=env, ) From 6c643528148f13de4c0fabdc4ba9d86eb5ff654d Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 13:12:33 +0200 Subject: [PATCH 41/57] added unit tests and old tests based on python lib "unittest" --- noxfile.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/noxfile.py b/noxfile.py index 7bc15c201..e61b89efc 100644 --- a/noxfile.py +++ b/noxfile.py @@ -173,12 +173,23 @@ def get_db_versions() -> List[str]: def run_tests_experimental(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" env = {"EXASOL_VERSION": db_version} + session.run("pytest", "./test/unit") session.run( "pytest", "--itde-db-version", db_version, "./test/integration/pytest_itde_test.py", env=env, ) + with session.chdir(ROOT): + session.run( + "python", + "-u", + "-m", + "unittest", + "discover", + "./exasol_integration_test_docker_environment/test", + env=env, + ) @nox.session(name="run-tests", python=False) From 84ffc3845a21393b958b248852e556e9b7147f24 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 14:57:21 +0200 Subject: [PATCH 42/57] finalized noxfile --- .github/workflows/test_only_8.17.0.yml | 20 ------------------ noxfile.py | 28 ++------------------------ 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml deleted file mode 100644 index e3b125064..000000000 --- a/.github/workflows/test_only_8.17.0.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Run test 8.17.0 - -on: - workflow_dispatch: - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - name: Run test 8.17.0 - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/prepare_poetry_env - - - name: Run test 8.17.0 - # run: poetry run pytest --log-level=DEBUG -s test/integration/pytest_itde_test.py - run: poetry run nox -s "run-tests-experimental(db_version='prerelease-8.17.0')" - # env: - # EXASOL_VERSION: "prerelease-8.17.0" diff --git a/noxfile.py b/noxfile.py index e61b89efc..3be985aac 100644 --- a/noxfile.py +++ b/noxfile.py @@ -168,9 +168,9 @@ def get_db_versions() -> List[str]: return db_versions -@nox.session(name="run-tests-experimental", python=False) +@nox.session(name="run-tests", python=False) @nox.parametrize("db_version", get_db_versions()) -def run_tests_experimental(session: nox.Session, db_version: str): +def run_tests(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" env = {"EXASOL_VERSION": db_version} session.run("pytest", "./test/unit") @@ -192,30 +192,6 @@ def run_tests_experimental(session: nox.Session, db_version: str): ) -@nox.session(name="run-tests", python=False) -@nox.parametrize("db_version", get_db_versions()) -def run_tests(session: nox.Session, db_version: str): - """Run the tests in the poetry environment""" - env = {"EXASOL_VERSION": db_version} - with session.chdir(ROOT): - session.run( - "python", - "-u", - "-m", - "unittest", - "discover", - "./exasol_integration_test_docker_environment/test", - env=env, - ) - session.run("pytest", "./test/unit") - session.run( - "pytest", - "--itde-db-version", db_version, - "./test/integration", - env=env, - ) - - @nox.session(name="run-minimal-tests", python=False) @nox.parametrize("db_version", get_db_versions()) def run_minimal_tests(session: nox.Session, db_version: str): From 9fb77b08b5b1b224e28380e60b753e90951b71e3 Mon Sep 17 00:00:00 2001 From: KK Date: Fri, 30 Jun 2023 14:54:49 +0100 Subject: [PATCH 43/57] [run all tests] From eac0c59822e5fadee95b1c7e6891751751484434 Mon Sep 17 00:00:00 2001 From: Christoph Kuhnke Date: Mon, 3 Jul 2023 10:47:32 +0200 Subject: [PATCH 44/57] Update test/integration/pytest_itde_test.py Co-authored-by: Torsten Kilias --- test/integration/pytest_itde_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 433dfca31..682ace020 100644 --- a/test/integration/pytest_itde_test.py +++ b/test/integration/pytest_itde_test.py @@ -27,7 +27,7 @@ def _ids(params): the current run of a matrix build uses a different version then executing all tests requires to download two docker images in total. For Exasol versions 8 and higher the size of the Docker Containers did drastically - increase which in turn causes error "no space left on device".""", + increase which in turn causes error "no space left on device" in the GitHub Action Runners.""", ) From 07575e5cef0248ed3eb68ddbd58789fe52d8f8d3 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 10:54:19 +0200 Subject: [PATCH 45/57] removed commented lines in 8.18.1/EXAConf --- docker_db_config_template/8.18.1/EXAConf | 4 ---- .../docker_db_config/8.18.1/EXAConf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docker_db_config_template/8.18.1/EXAConf b/docker_db_config_template/8.18.1/EXAConf index ceabff64f..b4ca0a1ec 100644 --- a/docker_db_config_template/8.18.1/EXAConf +++ b/docker_db_config_template/8.18.1/EXAConf @@ -104,10 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Commented out exposed ports as these are only used by - # https://github.com/exasol/docker-db/ - # Ports to be exposed (container : host) - # ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf index ceabff64f..b4ca0a1ec 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.18.1/EXAConf @@ -104,10 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Commented out exposed ports as these are only used by - # https://github.com/exasol/docker-db/ - # Ports to be exposed (container : host) - # ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 From 2c33cee6f712aa9dd5a335adb7403f863250a4c3 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 09:57:10 +0100 Subject: [PATCH 46/57] [run all tests] From 20f489845fe5bf6f091ad0af4980937b6dcba6cb Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 11:57:15 +0200 Subject: [PATCH 47/57] re-activated new integration tests --- noxfile.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index 3be985aac..ce9c3bfd9 100644 --- a/noxfile.py +++ b/noxfile.py @@ -174,12 +174,7 @@ def run_tests(session: nox.Session, db_version: str): """Run the tests in the poetry environment""" env = {"EXASOL_VERSION": db_version} session.run("pytest", "./test/unit") - session.run( - "pytest", - "--itde-db-version", db_version, - "./test/integration/pytest_itde_test.py", - env=env, - ) + session.run("pytest", "./test/integration", env=env) with session.chdir(ROOT): session.run( "python", From 66442a7f47d1a6fee799c45c3a400dd09cf547e3 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 12:06:19 +0200 Subject: [PATCH 48/57] added build script for experimental tests --- .github/workflows/test_only_8.17.0.yml | 16 ++++++++++++++++ noxfile.py | 7 +++++++ 2 files changed, 23 insertions(+) create mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml new file mode 100644 index 000000000..8509e3eb9 --- /dev/null +++ b/.github/workflows/test_only_8.17.0.yml @@ -0,0 +1,16 @@ +name: Run test 8.17.0 + +on: + workflow_dispatch: + pull_request: + +jobs: + build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: ./.github/actions/prepare_poetry_env + + - name: Execute actual tests + run: poetry run nox -s "run-tests-experimental(db_version='prerelease-8.17.0')" diff --git a/noxfile.py b/noxfile.py index ce9c3bfd9..c7742136c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -168,6 +168,13 @@ def get_db_versions() -> List[str]: return db_versions +@nox.session(name="run-tests-experimental", python=False) +@nox.parametrize("db_version", get_db_versions()) +def run_tests_experimental(session: nox.Session, db_version: str): + env = {"EXASOL_VERSION": db_version} + session.run("pytest", "./test/integration/test_udf_execution.py", env=env) + + @nox.session(name="run-tests", python=False) @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): From 30808e99f08d4a50058ef3cfebf552b444da8f55 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 14:12:05 +0200 Subject: [PATCH 49/57] fixed build script --- .github/workflows/test_only_8.17.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml index 8509e3eb9..60dc97812 100644 --- a/.github/workflows/test_only_8.17.0.yml +++ b/.github/workflows/test_only_8.17.0.yml @@ -5,7 +5,7 @@ on: pull_request: jobs: - build + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From de76d4dcbce1e139e3f1c4fbcd968a9418bce9e3 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 14:23:51 +0200 Subject: [PATCH 50/57] added chroot for 8.17.0/EXAConf as well --- docker_db_config_template/8.17.0/EXAConf | 4 +++- .../docker_db_config/8.17.0/EXAConf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker_db_config_template/8.17.0/EXAConf b/docker_db_config_template/8.17.0/EXAConf index e04288729..16b39890f 100644 --- a/docker_db_config_template/8.17.0/EXAConf +++ b/docker_db_config_template/8.17.0/EXAConf @@ -170,7 +170,9 @@ BuiltinScriptLanguageName = slc-6.0.0-c4-5-standard-EXASOL-8.0.0/ScriptLanguages-standard-EXASOL-8.0.0-slc-v6.0.0-PB5EHDLN AutoStart = True {% if additional_db_parameters %} - Params = {{ additional_db_parameters }} + Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {{ additional_db_parameters }} + {% else %} + Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {% endif %} # JDBC driver configuration diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf index e04288729..16b39890f 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf @@ -170,7 +170,9 @@ BuiltinScriptLanguageName = slc-6.0.0-c4-5-standard-EXASOL-8.0.0/ScriptLanguages-standard-EXASOL-8.0.0-slc-v6.0.0-PB5EHDLN AutoStart = True {% if additional_db_parameters %} - Params = {{ additional_db_parameters }} + Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {{ additional_db_parameters }} + {% else %} + Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {% endif %} # JDBC driver configuration From 180a9c6cb7c67885f75e8f6a24d9ad14adc788e9 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 14:47:26 +0200 Subject: [PATCH 51/57] changed COS version in path to sbin/nsexec_chroot to match ConfVersion --- docker_db_config_template/8.17.0/EXAConf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_db_config_template/8.17.0/EXAConf b/docker_db_config_template/8.17.0/EXAConf index 16b39890f..d7468c0c6 100644 --- a/docker_db_config_template/8.17.0/EXAConf +++ b/docker_db_config_template/8.17.0/EXAConf @@ -170,9 +170,9 @@ BuiltinScriptLanguageName = slc-6.0.0-c4-5-standard-EXASOL-8.0.0/ScriptLanguages-standard-EXASOL-8.0.0-slc-v6.0.0-PB5EHDLN AutoStart = True {% if additional_db_parameters %} - Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {{ additional_db_parameters }} + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {{ additional_db_parameters }} {% else %} - Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {% endif %} # JDBC driver configuration From 1082e826872b385553cb0721dc5d739c8c984517 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 15:27:59 +0200 Subject: [PATCH 52/57] copied EXAConf template to exasol_integration_test_docker_environment/docker_db_config --- .../docker_db_config/8.17.0/EXAConf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf index 16b39890f..d7468c0c6 100644 --- a/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf +++ b/exasol_integration_test_docker_environment/docker_db_config/8.17.0/EXAConf @@ -170,9 +170,9 @@ BuiltinScriptLanguageName = slc-6.0.0-c4-5-standard-EXASOL-8.0.0/ScriptLanguages-standard-EXASOL-8.0.0-slc-v6.0.0-PB5EHDLN AutoStart = True {% if additional_db_parameters %} - Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot {{ additional_db_parameters }} + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {{ additional_db_parameters }} {% else %} - Params = -sandboxCHROOT=/opt/exasol/cos-8.29.2/sbin/nsexec_chroot + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {% endif %} # JDBC driver configuration From e863e24c7d7abb23cb415d201558a563e25542c7 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 14:44:18 +0100 Subject: [PATCH 53/57] [run all tests] From 27f0c34da99f66bea75c4097d10b5badfa974114 Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 15:49:53 +0200 Subject: [PATCH 54/57] removed experimental workflow --- .github/workflows/test_only_8.17.0.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/test_only_8.17.0.yml diff --git a/.github/workflows/test_only_8.17.0.yml b/.github/workflows/test_only_8.17.0.yml deleted file mode 100644 index 60dc97812..000000000 --- a/.github/workflows/test_only_8.17.0.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Run test 8.17.0 - -on: - workflow_dispatch: - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/prepare_poetry_env - - - name: Execute actual tests - run: poetry run nox -s "run-tests-experimental(db_version='prerelease-8.17.0')" From 1424cc1258587177cf885d0b40a6c68268c1a4ba Mon Sep 17 00:00:00 2001 From: KK Date: Mon, 3 Jul 2023 15:16:46 +0100 Subject: [PATCH 55/57] [run all tests] From f66f715026634b2e60e787bce6adf5c336e4778c Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 4 Jul 2023 09:30:01 +0200 Subject: [PATCH 56/57] Fixed build matrix --- noxfile.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/noxfile.py b/noxfile.py index c7742136c..9278dab60 100644 --- a/noxfile.py +++ b/noxfile.py @@ -164,17 +164,11 @@ def get_db_versions() -> List[str]: # on DockerHub, yet. Instead, we add its pre-release version. db_versions.remove("8.17.0") db_versions.append("prerelease-8.17.0") + db_versions.remove("7.1.0") db_versions.append("7.1.0-d1") return db_versions -@nox.session(name="run-tests-experimental", python=False) -@nox.parametrize("db_version", get_db_versions()) -def run_tests_experimental(session: nox.Session, db_version: str): - env = {"EXASOL_VERSION": db_version} - session.run("pytest", "./test/integration/test_udf_execution.py", env=env) - - @nox.session(name="run-tests", python=False) @nox.parametrize("db_version", get_db_versions()) def run_tests(session: nox.Session, db_version: str): From b024bdcdc14b2d98a814884d14bfaf83b85e7363 Mon Sep 17 00:00:00 2001 From: KK Date: Tue, 4 Jul 2023 08:30:18 +0100 Subject: [PATCH 57/57] [run all tests]