From 390968aed867174753f32e14f5130cd80c029b2c Mon Sep 17 00:00:00 2001 From: Christoph Kuhnke Date: Tue, 4 Jul 2023 10:35:24 +0200 Subject: [PATCH] Unify ports for database, BucketFS, and SSH (#354) Co-authored-by: Torsten Kilias Co-authored-by: Torsten Kilias --- doc/changes/changes_2.0.0.md | 1 + doc/user_guide/user_guide.rst | 4 +- docker_db_config_template/7.0.0/EXAConf | 8 ++-- docker_db_config_template/7.1.0/EXAConf | 8 ++-- docker_db_config_template/8.17.0/EXAConf | 12 +++--- docker_db_config_template/8.18.1/EXAConf | 8 ++-- .../cli/cli.py | 2 +- .../docker_db_config/7.0.0/EXAConf | 8 ++-- .../docker_db_config/7.0.1/EXAConf | 8 ++-- .../docker_db_config/7.0.10/EXAConf | 8 ++-- .../docker_db_config/7.0.11/EXAConf | 8 ++-- .../docker_db_config/7.0.12/EXAConf | 8 ++-- .../docker_db_config/7.0.13/EXAConf | 8 ++-- .../docker_db_config/7.0.14/EXAConf | 8 ++-- .../docker_db_config/7.0.15/EXAConf | 8 ++-- .../docker_db_config/7.0.16/EXAConf | 8 ++-- .../docker_db_config/7.0.17/EXAConf | 8 ++-- .../docker_db_config/7.0.18/EXAConf | 8 ++-- .../docker_db_config/7.0.19/EXAConf | 8 ++-- .../docker_db_config/7.0.2/EXAConf | 8 ++-- .../docker_db_config/7.0.20/EXAConf | 8 ++-- .../docker_db_config/7.0.3/EXAConf | 8 ++-- .../docker_db_config/7.0.4/EXAConf | 8 ++-- .../docker_db_config/7.0.6/EXAConf | 8 ++-- .../docker_db_config/7.0.7/EXAConf | 8 ++-- .../docker_db_config/7.0.8/EXAConf | 8 ++-- .../docker_db_config/7.0.9/EXAConf | 8 ++-- .../docker_db_config/7.1.0/EXAConf | 8 ++-- .../docker_db_config/7.1.1/EXAConf | 8 ++-- .../docker_db_config/7.1.10/EXAConf | 8 ++-- .../docker_db_config/7.1.11/EXAConf | 8 ++-- .../docker_db_config/7.1.12/EXAConf | 8 ++-- .../docker_db_config/7.1.13/EXAConf | 8 ++-- .../docker_db_config/7.1.14/EXAConf | 8 ++-- .../docker_db_config/7.1.15/EXAConf | 8 ++-- .../docker_db_config/7.1.16/EXAConf | 8 ++-- .../docker_db_config/7.1.17/EXAConf | 8 ++-- .../docker_db_config/7.1.2/EXAConf | 8 ++-- .../docker_db_config/7.1.3/EXAConf | 8 ++-- .../docker_db_config/7.1.4/EXAConf | 8 ++-- .../docker_db_config/7.1.5/EXAConf | 8 ++-- .../docker_db_config/7.1.6/EXAConf | 8 ++-- .../docker_db_config/7.1.7/EXAConf | 8 ++-- .../docker_db_config/7.1.8/EXAConf | 8 ++-- .../docker_db_config/7.1.9/EXAConf | 8 ++-- .../docker_db_config/8.17.0/EXAConf | 12 +++--- .../docker_db_config/8.18.1/EXAConf | 26 ++++++------ .../lib/data/database_info.py | 2 + .../lib/data/ssh_info.py | 3 +- .../lib/test_environment/ports.py | 10 ++--- .../test_environment/spawn_test_database.py | 41 ++++++++++++------- .../test/test_test_env_reuse.py | 12 +++--- .../testing/api_test_environment.py | 17 ++++---- noxfile.py | 9 ++-- pytest_itde/__init__.py | 33 +++++++++++---- pytest_itde/config.py | 7 ++++ test/integration/pytest_itde_test.py | 22 ++++++++-- test/unit/pytest_plugin_itde_test.py | 7 ++-- 58 files changed, 258 insertions(+), 290 deletions(-) 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 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/docker_db_config_template/7.0.0/EXAConf b/docker_db_config_template/7.0.0/EXAConf index 5634bf01b..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..d7468c0c6 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 = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +157,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 +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.28.0/sbin/nsexec_chroot {{ additional_db_parameters }} + {% else %} + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {% endif %} # JDBC driver configuration @@ -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..b4ca0a1ec 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 @@ -104,8 +104,6 @@ Affinity = 11 UUID = F0EA64D47F374A00B0530772981C559EE1C59086 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +157,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 +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/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/docker_db_config/7.0.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf index 5634bf01b..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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. @@ -74,8 +74,6 @@ Name = n11 UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161 DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -121,7 +119,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 +153,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -88,8 +88,6 @@ Affinity = 11 UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C DockerVolume = n11 - # Ports to be exposed (container : host) - ExposedPorts = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -135,7 +133,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 +170,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..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 @@ -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 = 8888:8899, 6583:6594 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -159,7 +157,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 +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.28.0/sbin/nsexec_chroot {{ additional_db_parameters }} + {% else %} + Params = -sandboxCHROOT=/opt/exasol/cos-8.28.0/sbin/nsexec_chroot {% endif %} # JDBC driver configuration @@ -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..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 @@ -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 @@ -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,13 @@ 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 [[Disk : disk1]] Component = exastorage Devices = dev.1 @@ -116,7 +114,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 +154,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 +184,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 +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/lib/data/database_info.py b/exasol_integration_test_docker_environment/lib/data/database_info.py index 47c9f0d0e..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,9 +12,11 @@ def __init__( reused: bool, container_info: ContainerInfo = None, ssh_info: SshInfo = 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.forwarded_ports = forwarded_ports 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/ports.py b/exasol_integration_test_docker_environment/lib/test_environment/ports.py index ed1547083..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,21 +30,21 @@ 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': - return Ports(database=8563, bucketfs=6583, ssh=22) + # For external databases SSH port might depend on version database. + return Ports(database=8563, bucketfs=2580, ssh=None) @property - def docker(self) -> 'Ports': - return Ports(database=8888, bucketfs=6583, ssh=22) + def forward(self) -> 'Ports': + return Ports(database=8563, bucketfs=2580, ssh=20002) class Ports(metaclass=PortsType): 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..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 @@ -1,5 +1,5 @@ import math -from typing import Tuple +from typing import Optional, Tuple import docker import humanfriendly @@ -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 @@ -64,6 +68,14 @@ 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) @@ -117,16 +129,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, forwarded_ports): 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)) - if self.bucketfs_port_forward is not None: - result[f"{defaults.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)) + 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): @@ -158,8 +166,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): authorized_keys, docker_db_image_info, ) - - ports = self._port_mappings() + 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"} @@ -171,7 +178,7 @@ def enable_ssh_access(container: Container, authorized_keys: str): privileged=True, volumes=volumes, network_mode=None, - ports=ports, + ports=port_mapping, runtime=self.docker_runtime ) enable_ssh_access(db_container, authorized_keys) @@ -193,13 +200,14 @@ 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=Ports.default_ports, + ports=self.internal_ports, reused=reused, container_info=container_info, ssh_info=ssh_info, + forwarded_ports=self.forwarded_ports, ) return database_info @@ -329,6 +337,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.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/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/exasol_integration_test_docker_environment/testing/api_test_environment.py b/exasol_integration_test_docker_environment/testing/api_test_environment.py index bdcac81fe..ac2eb95b4 100644 --- a/exasol_integration_test_docker_environment/testing/api_test_environment.py +++ b/exasol_integration_test_docker_environment/testing/api_test_environment.py @@ -58,22 +58,23 @@ 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 = \ 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, + 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, diff --git a/noxfile.py b/noxfile.py index bcd7b9f92..9278dab60 100644 --- a/noxfile.py +++ b/noxfile.py @@ -164,6 +164,7 @@ 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 @@ -172,8 +173,10 @@ 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} + session.run("pytest", "./test/unit") + session.run("pytest", "./test/integration", env=env) with session.chdir(ROOT): - env = {"EXASOL_VERSION": db_version} session.run( "python", "-u", @@ -183,10 +186,6 @@ def run_tests(session: nox.Session, db_version: str): "./exasol_integration_test_docker_environment/test", env=env, ) - session.run( - "pytest", "--itde-db-version", db_version, './test/integration' - ) - session.run("pytest", './test/unit') @nox.session(name="run-minimal-tests", python=False) diff --git a/pytest_itde/__init__.py b/pytest_itde/__init__.py index e82eaa563..50a9c7ddb 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": "http://127.0.0.1:6666", + "default": f"http://127.0.0.1:{Ports.forward.bucketfs}", "help_text": "Base url used to connect to the bucketfs service", }, { @@ -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.""" @@ -150,13 +169,13 @@ 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(): 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,7 +185,7 @@ 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, + ssh_port_forward=ssh_access.port, db_mem_size="4GB", docker_db_image_version=itde.db_version, ) @@ -176,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 ) @@ -213,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""" diff --git a/test/integration/pytest_itde_test.py b/test/integration/pytest_itde_test.py index 5f905635e..682ace020 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 @@ -19,6 +20,18 @@ def _ids(params): return next(keys) +default_version = "8.18.1" +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" in the GitHub Action Runners.""", +) + + +@default_version_only @pytest.mark.slow @pytest.mark.parametrize( "files", @@ -39,6 +52,7 @@ def test_itde_smoke_test(make_test_files, pytester, files): assert result.ret == pytest.ExitCode.OK +@default_version_only @pytest.mark.parametrize( "files", [ @@ -47,7 +61,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 +71,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' """ @@ -65,9 +79,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')) """ ) diff --git a/test/unit/pytest_plugin_itde_test.py b/test/unit/pytest_plugin_itde_test.py index 0509fff06..aa1e2236e 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_ports.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_ports.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=8563, help_text="Port on which the exasol db is listening", ), Option(