From b4730c18d5aad6464635ef6ec261bf5e625f080c Mon Sep 17 00:00:00 2001 From: David Phillips Date: Tue, 24 Sep 2024 14:40:53 -0700 Subject: [PATCH 1/2] Rename tempto configuration files --- .../launcher/env/environment/EnvSinglenodeCompatibility.java | 2 +- ...mpto-configuration.yaml => legacy-tempto-configuration.yaml} | 0 ...rino-tempto-configuration.yaml => tempto-configuration.yaml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/{presto-tempto-configuration.yaml => legacy-tempto-configuration.yaml} (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/{trino-tempto-configuration.yaml => tempto-configuration.yaml} (100%) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java index 7ffb510e4b43..76349ccebd28 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java @@ -131,7 +131,7 @@ private String getIcebergConfigFor(String dockerImage) private void configureTestsContainer(Environment.Builder builder, Config config) { int version = getVersionFromDockerImageName(config.getCompatibilityTestDockerImage()); - String temptoConfig = version <= 350 ? "presto-tempto-configuration.yaml" : "trino-tempto-configuration.yaml"; + String temptoConfig = version <= 350 ? "legacy-tempto-configuration.yaml" : "tempto-configuration.yaml"; builder.configureContainer(TESTS, container -> container .withCopyFileToContainer( forHostPath(configDir.getPath(temptoConfig)), diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/legacy-tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/presto-tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/legacy-tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/trino-tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/tempto-configuration.yaml From 2ef82ae4a35ea00e3ee782622b48df1120b48163 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Tue, 24 Sep 2024 14:48:55 -0700 Subject: [PATCH 2/2] Rename product test config directory --- .../tests/product/launcher/cli/TestRun.java | 6 +++--- .../product/launcher/docker/DockerFiles.java | 2 +- .../product/launcher/env/Environment.java | 2 +- .../launcher/env/EnvironmentContainers.java | 2 +- .../env/common/HydraIdentityProvider.java | 2 +- .../env/common/KafkaSaslPlaintext.java | 4 ++-- .../product/launcher/env/common/KafkaSsl.java | 4 ++-- .../product/launcher/env/common/Standard.java | 18 +++++++++--------- .../env/configs/ConfigApacheHive3.java | 2 +- .../env/environment/EnvMultinodeAzure.java | 4 ++-- .../env/environment/EnvMultinodeGcs.java | 4 ++-- .../env/environment/EnvMultinodeKafkaSsl.java | 2 +- .../EnvMultinodePostgresqlSpooling.java | 2 +- .../EnvMultinodeSecretsProvider.java | 2 +- .../EnvSinglenodeCompatibility.java | 6 +++--- .../multinode-all/gsheets.properties | 3 --- .../multinode-gcs/apply-gcs-config.sh | 6 ------ .../multinode-phoenix5/phoenix.properties | 3 --- .../singlenode-hive-acid/apply-hive-config.sh | 5 ----- .../apply-hive-config-for-iceberg.sh | 5 ----- .../apply-hive-config-for-iceberg.sh | 5 ----- .../avro/add_column_schema.avsc | 0 .../avro/camelCaseSchema.avsc | 0 .../avro/change_column_type_schema.avsc | 0 ...column_with_long_type_definition_data.avro | 0 ...lumn_with_long_type_definition_schema.avsc | 0 .../avro/incompatible_type_schema.avsc | 0 .../avro/invalid_default.avro | Bin .../avro/invalid_default.avsc | 0 .../avro/original_data.avro | Bin .../avro/original_schema.avsc | 0 .../avro/remove_column_schema.avsc | 0 .../avro/rename_column_schema.avsc | 0 .../hiveserver2-site.xml | 0 .../kms-acls.xml | 0 .../hive-disable-key-provider-cache-site.xml | 0 .../hadoop-kerberos-kms/kms-core-site.xml | 0 .../tempto-configuration.yaml | 2 +- .../common/hadoop-kerberos/config.properties | 4 ++-- .../create_kerberos_credential_cache_files.sh | 0 .../common/hadoop-kerberos/krb5.conf | 0 .../hadoop-kerberos/tempto-configuration.yaml | 2 +- .../common/hadoop/apply-config-overrides.sh | 0 .../common/hadoop/hadoop-run.sh | 0 .../common/hadoop/hive.properties | 2 +- .../hadoop/hive_timestamp_nanos.properties | 2 +- .../hive_with_external_writes.properties | 2 +- .../hive_with_run_view_as_invoker.properties | 2 +- .../common/hadoop/iceberg.properties | 2 +- .../common/http-proxy/httpd.conf | 0 .../common/https-proxy/cert/create-certs.sh | 0 .../common/https-proxy/cert/proxy.conf | 0 .../common/https-proxy/cert/proxy.pem | 0 .../common/https-proxy/cert/truststore.jks | Bin .../common/https-proxy/httpd.conf | 0 .../hydra-identity-provider/cert/generate.sh | 0 .../hydra-identity-provider/cert/hydra.conf | 0 .../hydra-identity-provider/cert/hydra.pem | 0 .../hydra-identity-provider/cert/trino.conf | 0 .../hydra-identity-provider/cert/trino.pem | 0 .../cert/truststore.jks | Bin .../login_and_consent_server.py | 0 ...empto-configuration-for-docker-oauth2.yaml | 2 +- .../common/kafka/log.properties | 0 .../kafka/log4j-kafka.properties.template | 0 .../log4j-schema-registry.properties.template | 0 .../common/minio/apply-minio-config.sh | 2 +- .../minio/minio-core-site-overrides.xml | 0 .../common/spark/log4j2.properties | 0 .../multinode-master-config.properties | 0 .../multinode-worker-config.properties | 0 .../common/standard/access-control.properties | 0 .../common/standard/config.properties | 0 .../common/standard/set-trino-cli.sh | 0 .../multinode-master-config.properties | 0 .../multinode-worker-config.properties | 0 .../multinode-all/accumulo.properties | 0 .../multinode-all/bigquery.properties | 0 .../multinode-all/cassandra.properties | 0 .../multinode-all/clickhouse.properties | 0 .../multinode-all/delta_lake.properties | 0 .../multinode-all/druid.properties | 0 .../multinode-all/elasticsearch.properties | 0 .../multinode-all/exasol.properties | 0 .../multinode-all/google-sheets-auth.json | 0 .../multinode-all/gsheets.properties | 3 +++ .../environment/multinode-all/hive.properties | 0 .../environment/multinode-all/hudi.properties | 0 .../multinode-all/iceberg.properties | 0 .../multinode-all/ignite.properties | 0 .../conf/environment/multinode-all/jvm.config | 0 .../multinode-all/kafka.properties | 0 .../multinode-all/kinesis.properties | 0 .../environment/multinode-all/kudu.properties | 0 .../multinode-all/mariadb.properties | 0 .../multinode-all/memory.properties | 0 .../multinode-all/mongodb.properties | 0 .../multinode-all/mysql.properties | 0 .../multinode-all/opensearch.properties | 0 .../multinode-all/oracle.properties | 0 .../multinode-all/phoenix5.properties | 0 .../multinode-all/pinot.properties | 0 .../multinode-all/postgresql.properties | 0 .../multinode-all/prometheus-bearer.txt | 0 .../multinode-all/prometheus.properties | 2 +- .../multinode-all/raptor_legacy.properties | 0 .../multinode-all/redis.properties | 0 .../multinode-all/redshift.properties | 0 .../multinode-all/singlestore.properties | 0 .../multinode-all/snowflake.properties | 0 .../multinode-all/sqlserver.properties | 0 .../multinode-all/tpcds.properties | 0 .../multinode-all/trino_thrift.properties | 0 .../multinode-azure/apply-azure-config.sh | 2 +- .../core-site-overrides-template.xml | 0 .../multinode-azure/delta.properties | 0 .../multinode-azure/hive.properties | 0 .../multinode-azure/iceberg.properties | 0 .../multinode-azure/spark-defaults.conf | 0 .../multinode-azure/update-location.sh | 0 .../multinode-cassandra/cassandra.properties | 0 .../clickhouse.properties | 0 .../multinode-clickhouse/metrika.xml | 0 .../tempto-configuration.yaml | 0 .../environment/multinode-clickhouse/test.xml | 0 .../delta.properties | 0 .../hive.properties | 0 .../tempto-configuration.yaml | 0 .../multinode-exasol/exasol.properties | 0 .../tempto-configuration.yaml | 0 .../multinode-gcs/apply-gcs-config.sh | 6 ++++++ .../core-site-overrides-template.xml | 0 .../multinode-gcs/delta.properties | 0 .../hive-site-overrides-template.xml | 0 .../environment/multinode-gcs/hive.properties | 0 .../multinode-gcs/iceberg.properties | 0 .../multinode-gcs/spark-defaults.conf | 0 .../multinode-gcs/tempto-configuration.yaml | 0 .../multinode-hive-cached/hive.properties | 2 +- .../iceberg.properties | 0 .../multinode-ignite/ignite.properties | 0 .../environment/multinode-ignite/jvm.config | 0 .../tempto-configuration.yaml | 0 .../kafka.properties | 2 +- .../kafka_schema_registry.properties | 0 .../tempto-configuration.yaml | 0 .../kafka-configuration.properties | 0 .../kafka.properties | 4 ++-- .../kafka_schema_registry.properties | 2 +- .../kafka_server_jaas.conf | 0 .../tempto-configuration.yaml | 0 .../multinode-kafka-ssl/kafka.properties | 6 +++--- .../kafka_schema_registry.properties | 4 ++-- .../multinode-kafka-ssl/secrets/.gitignore | 2 +- .../secrets/broker1_keystore_creds | 0 .../secrets/broker1_sslkey_creds | 0 .../secrets/broker1_truststore_creds | 0 .../secrets/client_keystore_creds | 0 .../secrets/client_sslkey_creds | 0 .../secrets/client_truststore_creds | 0 .../secrets/create-certs.sh | 0 .../secrets/kafka.broker1.keystore | Bin .../secrets/kafka.broker1.truststore | Bin .../secrets/kafka.client.keystore | Bin .../secrets/kafka.client.truststore | Bin .../tempto-configuration.yaml | 4 ++-- .../multinode-kafka}/kafka.properties | 2 +- .../kafka_schema_registry.properties | 0 .../multinode-kafka/tempto-configuration.yaml | 0 .../multinode-kerberos-kudu/kerberos_init.sh | 0 .../multinode-kerberos-kudu/krb5.conf | 0 .../multinode-kerberos-kudu/kudu.properties | 0 .../multinode-mariadb/mariadb.properties | 0 .../tempto-configuration.yaml | 0 .../delta.properties | 0 .../exchange-manager.properties | 0 .../iceberg.properties | 0 .../delta.properties | 0 .../multinode-minio-data-lake/hive.properties | 0 .../iceberg.properties | 0 .../memory.properties | 0 .../multinode-mysql/mysql.properties | 0 .../multinode-parquet/tpcds.properties | 0 .../multinode-parquet/tpch.properties | 0 .../multinode-phoenix5/hbase-site.xml | 0 .../multinode-phoenix5/phoenix.properties | 3 +++ .../tempto-configuration.yaml | 0 .../coordinator-config.properties | 0 .../spooling-manager.properties | 0 .../tempto-configuration.yaml | 0 .../worker-config.properties | 0 .../postgresql.properties | 0 .../authenticator.properties | 0 .../catalog/postgresql.properties | 0 .../config-master.properties | 4 ++-- .../config-worker.properties | 4 ++-- .../generateSecrets.sh | 8 ++++---- .../multinode-secrets-provider/password.db | 0 .../multinode-secrets-provider/secrets.toml | 2 +- .../tempto-configuration.yaml | 2 +- .../multinode-snowflake/jvm.config | 0 .../multinode-snowflake/snowflake.properties | 0 .../multinode-sqlserver/sqlserver.properties | 0 .../krb5_client.conf | 0 .../tempto-configuration.yaml | 0 .../config-master.properties | 4 ++-- .../config-worker.properties | 4 ++-- .../multinode-tls-kerberos/hive.properties | 2 +- .../multinode-tls-kerberos/iceberg.properties | 2 +- .../multinode-tls/config-master.properties | 4 ++-- .../multinode-tls/config-worker.properties | 4 ++-- .../multinode/multinode-master-jvm.config | 0 .../multinode/multinode-worker-jvm.config | 0 .../config-with-system-memory.properties | 0 .../config.properties | 0 .../hive-hadoop2.properties | 0 .../singlenode-compatibility/hive.properties | 0 .../iceberg.properties | 0 .../iceberg_old.properties | 0 .../legacy-tempto-configuration.yaml | 0 .../tempto-configuration.yaml | 0 .../delta.properties | 0 .../hive.properties | 0 .../tempto-configuration.yaml | 0 .../delta.properties | 0 .../delta.properties | 0 .../singlenode-delta-lake-oss/hive.properties | 0 .../spark-defaults.conf | 0 .../tempto-configuration.yaml | 0 .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../singlenode-hive-acid/apply-hive-config.sh | 5 +++++ .../hive-site-overrides.xml | 0 .../hive.properties | 2 +- .../hudi.properties | 0 .../log4j.properties | 0 .../spark-defaults.conf | 0 .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../singlenode-hudi/hive.properties | 2 +- .../singlenode-hudi/hudi.properties | 0 .../singlenode-hudi/log4j.properties | 0 .../singlenode-hudi/spark-defaults.conf | 0 .../hive.properties | 0 .../iceberg.properties | 0 .../core-site.xml | 0 .../hdfs-site.xml | 0 .../hive-data-protection-site.xml | 0 .../hive.properties | 2 +- .../core-site.xml | 0 .../hdfs-site.xml | 0 .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 2 +- .../iceberg.properties | 2 +- .../hive.properties | 0 .../iceberg.properties | 0 .../hive.properties | 0 .../iceberg.properties | 0 .../hive.properties | 0 .../iceberg.properties | 0 .../hive.properties | 0 .../iceberg.properties | 0 .../config.properties | 0 .../file-authenticator.properties | 0 .../password-authenticator.properties | 0 .../singlenode-ldap-and-file/password.db | 0 .../tempto-configuration.yaml | 0 .../password-authenticator.properties | 0 .../password-authenticator.properties | 0 .../password-authenticator.properties | 0 .../singlenode-ldap/config.properties | 0 .../password-authenticator.properties | 0 .../README.md | 0 .../proxy/.htpasswd | 0 .../proxy/httpd.conf | 0 .../trino/config.properties | 4 ++-- .../trino/log.properties | 0 .../README.md | 0 .../proxy/.htpasswd | 0 .../proxy/httpd.conf | 0 .../trino/config.properties | 4 ++-- .../trino/log.properties | 0 .../config.properties | 4 ++-- .../log.properties | 0 .../config.properties | 4 ++-- .../log.properties | 0 .../config.properties | 4 ++-- .../singlenode-oauth2-refresh/log.properties | 0 .../singlenode-oauth2/config.properties | 4 ++-- .../singlenode-oauth2/log.properties | 0 .../singlenode-oidc-refresh/config.properties | 4 ++-- .../singlenode-oidc-refresh/log.properties | 0 .../singlenode-oidc/config.properties | 4 ++-- .../singlenode-oidc/log.properties | 0 .../hive.properties | 2 +- .../spark-defaults.conf | 0 .../singlenode-spark-hive/hive.properties | 2 +- .../singlenode-spark-hive/spark-defaults.conf | 0 .../apply-hive-config-for-iceberg.sh | 5 +++++ .../create-table.sql | 0 .../hive-site-overrides.xml | 0 .../iceberg.properties | 0 .../spark-defaults.conf | 0 .../tpch.properties | 0 .../iceberg.properties | 0 .../spark-defaults.conf | 0 .../iceberg.properties | 0 .../spark-defaults.conf | 0 .../apply-hive-config-for-iceberg.sh | 5 +++++ .../hive-site-overrides.xml | 0 .../iceberg.properties | 0 .../spark-defaults.conf | 0 .../two-kerberos-hives/auth-to-local.xml | 0 .../hadoop-master-2-copy-keytabs.sh | 0 .../hadoop-master-copy-keytabs.sh | 0 .../two-kerberos-hives/hive1.properties | 2 +- .../hive2-default-fs-site.xml | 0 .../two-kerberos-hives/hive2.properties | 4 ++-- .../two-kerberos-hives}/iceberg1.properties | 2 +- .../two-kerberos-hives/iceberg2.properties | 4 ++-- .../two-kerberos-hives/presto-krb5.conf | 0 .../two-kerberos-hives/update-location.sh | 0 .../hadoop-master-2/core-site.xml | 0 .../hadoop-master-2/hdfs-site.xml | 0 .../hadoop-master-2/mapred-site.xml | 0 .../hadoop-master-2/update-location.sh | 0 .../hadoop-master-2/yarn-site.xml | 0 .../two-mixed-hives/hive1.properties | 2 +- .../two-mixed-hives/hive2-default-fs-site.xml | 0 .../two-mixed-hives/hive2.properties | 2 +- .../two-mixed-hives}/iceberg1.properties | 2 +- .../two-mixed-hives/iceberg2.properties | 2 +- .../conf/tempto/logging.properties | 0 ...mpto-configuration-for-docker-default.yaml | 0 .../tempto-configuration-for-docker-ldap.yaml | 0 .../tempto-configuration-for-docker-tls.yaml | 2 +- .../tempto-configuration-for-hms-only.yaml | 0 ...pto-configuration-profile-config-file.yaml | 0 .../conf/trino}/etc/README.md | 0 .../trino}/etc/catalog/blackhole.properties | 0 .../conf/trino}/etc/catalog/jmx.properties | 0 .../etc/catalog/kafka/all_datatypes.proto | 0 .../kafka/all_datatypes_avro_schema.avsc | 0 .../catalog/kafka/all_datatypes_protobuf.json | 2 +- .../etc/catalog/kafka/basic_datatypes.proto | 0 .../kafka/basic_structural_datatypes.proto | 0 .../catalog/kafka/pushdown_create_time.json | 0 .../etc/catalog/kafka/pushdown_offset.json | 0 .../etc/catalog/kafka/pushdown_partition.json | 0 .../kafka/read_all_datatypes_avro.json | 2 +- .../catalog/kafka/read_all_datatypes_csv.json | 0 .../kafka/read_all_datatypes_json.json | 0 .../catalog/kafka/read_all_datatypes_raw.json | 0 .../etc/catalog/kafka/read_all_null_avro.json | 2 +- .../kafka/read_basic_datatypes_protobuf.json | 2 +- ...d_basic_structural_datatypes_protobuf.json | 2 +- .../kafka/read_simple_key_and_value.json | 0 .../kafka/read_structural_datatype_avro.json | 2 +- .../catalog/kafka/schema_with_references.avsc | 0 .../catalog/kafka/structural_datatype.proto | 0 .../structural_datatype_avro_schema.avsc | 0 .../kafka/structural_datatype_protobuf.json | 2 +- .../kafka/write_all_datatypes_avro.json | 2 +- .../kafka/write_all_datatypes_csv.json | 0 .../kafka/write_all_datatypes_json.json | 0 .../kafka/write_all_datatypes_raw.json | 0 .../kafka/write_simple_key_and_value.json | 0 .../kafka/write_structural_datatype_avro.json | 2 +- .../conf/trino}/etc/catalog/tpch.properties | 0 .../conf/trino}/etc/docker.cluster.jks | Bin .../conf/trino}/etc/hive-default-fs-site.xml | 0 .../conf/trino}/etc/jvm-pre-jdk22.config | 0 .../conf/trino}/etc/jvm.config | 0 .../conf/trino}/etc/presto-master.jks | Bin .../conf/trino}/etc/secrets.toml | 0 .../health-checks/hadoop-health-check.sh | 0 .../health-checks/health.sh | 0 .../health-checks/trino-health-check.sh | 0 .../run-presto.sh | 2 +- .../local/TestManuallyJdbcOauth2.java | 2 +- .../hive/BaseTestAvroSchemaEvolution.java | 12 ++++++------ .../hive/TestAvroSchemaStrictness.java | 4 ++-- .../tests/product/hive/TestAvroSchemaUrl.java | 4 ++-- .../hive/TestAvroSymlinkInputFormat.java | 2 +- .../kafka/TestKafkaAvroReadsSmokeTest.java | 6 +++--- .../TestKafkaProtobufReadsSmokeTest.java | 6 +++--- 397 files changed, 183 insertions(+), 183 deletions(-) delete mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/gsheets.properties delete mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh delete mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/phoenix.properties delete mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh delete mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/apply-hive-config-for-iceberg.sh delete mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/add_column_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/camelCaseSchema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/change_column_type_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/column_with_long_type_definition_data.avro (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/column_with_long_type_definition_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/incompatible_type_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/invalid_default.avro (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/invalid_default.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/original_data.avro (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/original_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/remove_column_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/avro/rename_column_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos-kms-with-impersonation/hiveserver2-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos-kms-with-impersonation/kms-acls.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos-kms/hive-disable-key-provider-cache-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos-kms/kms-core-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos-kms/tempto-configuration.yaml (96%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos/config.properties (79%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos/create_kerberos_credential_cache_files.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos/krb5.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop-kerberos/tempto-configuration.yaml (96%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/apply-config-overrides.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/hadoop-run.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/hive.properties (83%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/hive_timestamp_nanos.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/hive_with_external_writes.properties (80%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/hive_with_run_view_as_invoker.properties (75%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hadoop/iceberg.properties (64%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/http-proxy/httpd.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/https-proxy/cert/create-certs.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/https-proxy/cert/proxy.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/https-proxy/cert/proxy.pem (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/https-proxy/cert/truststore.jks (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/https-proxy/httpd.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/generate.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/hydra.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/hydra.pem (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/trino.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/trino.pem (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/cert/truststore.jks (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/login_and_consent_server.py (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml (88%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/kafka/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/kafka/log4j-kafka.properties.template (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/kafka/log4j-schema-registry.properties.template (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/minio/apply-minio-config.sh (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/minio/minio-core-site-overrides.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/spark/log4j2.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/standard-multinode/multinode-master-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/standard-multinode/multinode-worker-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/standard/access-control.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/standard/config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/standard/set-trino-cli.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/task-retries-multinode/multinode-master-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/common/task-retries-multinode/multinode-worker-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/accumulo.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/bigquery.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/cassandra.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/clickhouse.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/delta_lake.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/druid.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/elasticsearch.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/exasol.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/google-sheets-auth.json (100%) create mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/gsheets.properties rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/hudi.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/ignite.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/kafka.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/kinesis.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/kudu.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/mariadb.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/memory.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/mongodb.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/mysql.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/opensearch.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/oracle.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/phoenix5.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/pinot.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/postgresql.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/prometheus-bearer.txt (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/prometheus.properties (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/raptor_legacy.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/redis.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/redshift.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/singlestore.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/snowflake.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/sqlserver.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/tpcds.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-all/trino_thrift.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/apply-azure-config.sh (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/core-site-overrides-template.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-azure/update-location.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-cassandra/cassandra.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-clickhouse/clickhouse.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-clickhouse/metrika.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-clickhouse/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-clickhouse/test.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-databricks-http-hms/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-databricks-http-hms/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-databricks-http-hms/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-exasol/exasol.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-exasol/tempto-configuration.yaml (100%) create mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/core-site-overrides-template.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/hive-site-overrides-template.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-gcs/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-hive-cached/hive.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-iceberg-minio-cached/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-ignite/ignite.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-ignite/jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-ignite/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/environment/multinode-kafka => trino-product-tests/conf/environment/multinode-kafka-confluent-license}/kafka.properties (93%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-sasl-plaintext/kafka-configuration.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-sasl-plaintext/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/kafka.properties (82%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/.gitignore (57%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/broker1_keystore_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/broker1_sslkey_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/broker1_truststore_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/client_keystore_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/client_sslkey_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/client_truststore_creds (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/create-certs.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.keystore (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.truststore (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/kafka.client.keystore (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/secrets/kafka.client.truststore (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml (65%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/environment/multinode-kafka-confluent-license => trino-product-tests/conf/environment/multinode-kafka}/kafka.properties (93%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka/kafka_schema_registry.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kafka/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kerberos-kudu/kerberos_init.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kerberos-kudu/krb5.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-kerberos-kudu/kudu.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-mariadb/mariadb.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-mariadb/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake-cached/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake-task-retries-filesystem/exchange-manager.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake-task-retries-filesystem/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-minio-data-lake/memory.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-mysql/mysql.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-parquet/tpcds.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-parquet/tpch.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-phoenix5/hbase-site.xml (100%) create mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/phoenix.properties rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-phoenix5/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-postgresql-spooling/coordinator-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-postgresql-spooling/spooling-manager.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-postgresql-spooling/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-postgresql-spooling/worker-config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-postgresql/postgresql.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/catalog/postgresql.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/config-master.properties (77%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/config-worker.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/generateSecrets.sh (67%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/password.db (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/secrets.toml (54%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-secrets-provider/tempto-configuration.yaml (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-snowflake/jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-snowflake/snowflake.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-sqlserver/sqlserver.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos-delegation/krb5_client.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos-delegation/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos/config-master.properties (78%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos/config-worker.properties (77%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos/hive.properties (88%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls-kerberos/iceberg.properties (85%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls/config-master.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode-tls/config-worker.properties (70%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode/multinode-master-jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/multinode/multinode-worker-jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/config-with-system-memory.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/hive-hadoop2.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/iceberg_old.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/legacy-tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-compatibility/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-databricks/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-databricks/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-databricks/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-kerberized-hdfs/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-oss/delta.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-oss/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-oss/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-delta-lake-oss/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hdfs-impersonation/hive.properties (80%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hdfs-impersonation/iceberg.properties (67%) create mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-acid/hive-site-overrides.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-hudi-redirections/hive.properties (68%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-hudi-redirections/hudi.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-hudi-redirections/log4j.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-hudi-redirections/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-iceberg-redirections/hive.properties (69%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-iceberg-redirections/iceberg.properties (57%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-impersonation/hive.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hive-impersonation/iceberg.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hudi/hive.properties (60%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hudi/hudi.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hudi/log4j.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-hudi/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/core-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hdfs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive-data-protection-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties (81%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/core-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hdfs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties (90%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/iceberg.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties (91%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-impersonation/iceberg.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties (89%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hdfs-no-impersonation/iceberg.properties (85%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties (93%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/iceberg.properties (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties (93%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-impersonation/iceberg.properties (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties (89%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/iceberg.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-and-file/config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-and-file/file-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-and-file/password-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-and-file/password.db (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-and-file/tempto-configuration.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-bind-dn/password-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-referrals/password-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap-without-ssl/password-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap/config.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-ldap/password-authenticator.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-http-proxy/README.md (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-http-proxy/proxy/.htpasswd (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-http-proxy/proxy/httpd.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-http-proxy/trino/config.properties (85%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-http-proxy/trino/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-https-proxy/README.md (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-https-proxy/proxy/.htpasswd (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-https-proxy/proxy/httpd.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-https-proxy/trino/config.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-authenticated-https-proxy/trino/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-http-proxy/config.properties (84%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-http-proxy/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-https-proxy/config.properties (85%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-https-proxy/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-refresh/config.properties (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2-refresh/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2/config.properties (83%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oauth2/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oidc-refresh/config.properties (83%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oidc-refresh/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oidc/config.properties (80%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-oidc/log.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties (77%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-hive-no-stats-fallback/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-hive/hive.properties (75%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-hive/spark-defaults.conf (100%) create mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/apply-hive-config-for-iceberg.sh rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-jdbc-catalog/create-table.sql (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-jdbc-catalog/hive-site-overrides.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-jdbc-catalog/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-jdbc-catalog/tpch.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-rest/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg-rest/spark-defaults.conf (100%) create mode 100755 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg/hive-site-overrides.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg/iceberg.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/singlenode-spark-iceberg/spark-defaults.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/auth-to-local.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/hadoop-master-2-copy-keytabs.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/hadoop-master-copy-keytabs.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/hive1.properties (90%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/hive2-default-fs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/hive2.properties (79%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/environment/two-mixed-hives => trino-product-tests/conf/environment/two-kerberos-hives}/iceberg1.properties (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/iceberg2.properties (72%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/presto-krb5.conf (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-kerberos-hives/update-location.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hadoop-master-2/core-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hadoop-master-2/hdfs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hadoop-master-2/mapred-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hadoop-master-2/update-location.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hadoop-master-2/yarn-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hive1.properties (90%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hive2-default-fs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/hive2.properties (71%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/environment/two-kerberos-hives => trino-product-tests/conf/environment/two-mixed-hives}/iceberg1.properties (87%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/environment/two-mixed-hives/iceberg2.properties (52%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/logging.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/tempto-configuration-for-docker-default.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/tempto-configuration-for-docker-ldap.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/tempto-configuration-for-docker-tls.yaml (86%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/tempto-configuration-for-hms-only.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/conf/tempto/tempto-configuration-profile-config-file.yaml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/README.md (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/blackhole.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/jmx.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/all_datatypes.proto (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/all_datatypes_avro_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/all_datatypes_protobuf.json (91%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/basic_datatypes.proto (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/basic_structural_datatypes.proto (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/pushdown_create_time.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/pushdown_offset.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/pushdown_partition.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_all_datatypes_avro.json (84%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_all_datatypes_csv.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_all_datatypes_json.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_all_datatypes_raw.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_all_null_avro.json (84%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_basic_datatypes_protobuf.json (88%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_basic_structural_datatypes_protobuf.json (79%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_simple_key_and_value.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/read_structural_datatype_avro.json (78%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/schema_with_references.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/structural_datatype.proto (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/structural_datatype_avro_schema.avsc (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/structural_datatype_protobuf.json (92%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_all_datatypes_avro.json (85%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_all_datatypes_csv.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_all_datatypes_json.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_all_datatypes_raw.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_simple_key_and_value.json (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/kafka/write_structural_datatype_avro.json (80%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/catalog/tpch.properties (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/docker.cluster.jks (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/hive-default-fs-site.xml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/jvm-pre-jdk22.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/jvm.config (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/presto-master.jks (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests/conf/presto => trino-product-tests/conf/trino}/etc/secrets.toml (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/health-checks/hadoop-health-check.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/health-checks/health.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/health-checks/trino-health-check.sh (100%) rename testing/trino-product-tests-launcher/src/main/resources/docker/{presto-product-tests => trino-product-tests}/run-presto.sh (92%) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java index 77eac6f504d7..90c757e3e08a 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java @@ -344,13 +344,13 @@ private Environment getEnvironment() // the test jar is hundreds MB and file system bind is much more efficient .withFileSystemBind(testJar.getPath(), "/docker/test.jar", READ_ONLY) .withFileSystemBind(cliJar.getPath(), "/docker/trino-cli", READ_ONLY) - .withCopyFileToContainer(forClasspathResource("docker/presto-product-tests/common/standard/set-trino-cli.sh"), "/etc/profile.d/set-trino-cli.sh") + .withCopyFileToContainer(forClasspathResource("docker/trino-product-tests/common/standard/set-trino-cli.sh"), "/etc/profile.d/set-trino-cli.sh") .withEnv("JAVA_HOME", jdkProvider.getJavaHome()) .withCommand(ImmutableList.builder() .add( jdkProvider.getJavaCommand(), "-Xmx1g", - "-Djava.util.logging.config.file=/docker/presto-product-tests/conf/tempto/logging.properties", + "-Djava.util.logging.config.file=/docker/trino-product-tests/conf/tempto/logging.properties", "-Duser.timezone=Asia/Kathmandu", // https://bugs.openjdk.org/browse/JDK-8327134 "-Djava.security.manager=allow", @@ -361,7 +361,7 @@ private Environment getEnvironment() "-jar", "/docker/test.jar", "--config", String.join(",", ImmutableList.builder() .add("tempto-configuration.yaml") // this comes from classpath - .add("/docker/presto-product-tests/conf/tempto/tempto-configuration-for-docker-default.yaml") + .add("/docker/trino-product-tests/conf/tempto/tempto-configuration-for-docker-default.yaml") .add(CONTAINER_TEMPTO_PROFILE_CONFIG) .add(environmentConfig.getTemptoEnvironmentConfigFile()) .add(container.getEnvMap().getOrDefault("TEMPTO_CONFIG_FILES", "/dev/null")) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java index 08d998d68262..2ace2bae512c 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/docker/DockerFiles.java @@ -39,7 +39,7 @@ public final class DockerFiles implements AutoCloseable { - public static final String ROOT_PATH = "docker/presto-product-tests/"; + public static final String ROOT_PATH = "docker/trino-product-tests/"; private static final Logger log = Logger.get(DockerFiles.class); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java index 69adaa55c0d6..e7ceadc7d05b 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java @@ -699,7 +699,7 @@ private void addConfiguredFeaturesConfig() catch (IOException e) { throw new RuntimeException(e); } - String temptoConfig = "/docker/presto-product-tests/conf/tempto/tempto-configured-features.yaml"; + String temptoConfig = "/docker/trino-product-tests/conf/tempto/tempto-configured-features.yaml"; testContainer.withCopyFileToContainer(forHostPath(tempFile.getPath()), temptoConfig); // add custom tempto config and configured_features to arguments if there are any other groups enabled String[] commandParts = testContainer.getCommandParts(); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java index f3b53fe2c531..3974b75fef32 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java @@ -57,7 +57,7 @@ public static void configureTempto(Environment.Builder builder, ResourceProvider builder.configureContainer(TESTS, dockerContainer -> { Path path = configDir.getPath("tempto-configuration.yaml"); String suffix = getParentDirectoryName(path) + "-" + randomNameSuffix(); - String temptoConfig = "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-" + suffix + ".yaml"; + String temptoConfig = "/docker/trino-product-tests/conf/tempto/tempto-configuration-for-" + suffix + ".yaml"; dockerContainer .withCopyFileToContainer(forHostPath(path), temptoConfig) .withEnv("TEMPTO_CONFIG_FILES", temptoConfigFiles -> diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java index 75b9fe311986..bfb9237365ca 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java @@ -122,7 +122,7 @@ public void extendEnvironment(Environment.Builder builder) CONTAINER_TEMPTO_PROFILE_CONFIG) .withCopyFileToContainer( forHostPath(configDir.getPath("cert/truststore.jks")), - "/docker/presto-product-tests/truststore.jks")); + "/docker/trino-product-tests/truststore.jks")); } public DockerContainer createClient( diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java index fa1db52f1fd1..2eb4d4d624a7 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSaslPlaintext.java @@ -53,7 +53,7 @@ public void extendEnvironment(Environment.Builder builder) "password=\"admin-secret\" " + "user_admin=\"admin-secret\";") .withEnv("ZOOKEEPER_SASL_ENABLED", "false") - .withClasspathResourceMapping("docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf", "/tmp/kafka_server_jaas.conf", BindMode.READ_ONLY)); + .withClasspathResourceMapping("docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf", "/tmp/kafka_server_jaas.conf", BindMode.READ_ONLY)); builder.configureContainer(Kafka.SCHEMA_REGISTRY, container -> container .withStartupAttempts(3) .withStartupTimeout(Duration.ofMinutes(5)) @@ -63,7 +63,7 @@ public void extendEnvironment(Environment.Builder builder) .withEnv("SCHEMA_REGISTRY_KAFKASTORE_SASL_JAAS_CONFIG", "org.apache.kafka.common.security.plain.PlainLoginModule required " + "username=\"admin\" " + "password=\"admin-secret\";") - .withClasspathResourceMapping("docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf", "/tmp/kafka_server_jaas.conf", BindMode.READ_ONLY)); + .withClasspathResourceMapping("docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf", "/tmp/kafka_server_jaas.conf", BindMode.READ_ONLY)); } @Override diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java index ef954ff0d8c4..9d741cce60aa 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/KafkaSsl.java @@ -53,7 +53,7 @@ public void extendEnvironment(Environment.Builder builder) .withEnv("KAFKA_SSL_CLIENT_AUTH", "required") .withEnv("KAFKA_SECURITY_INTER_BROKER_PROTOCOL", "SSL") .withEnv("KAFKA_SECURITY_PROTOCOL", "SSL") - .withClasspathResourceMapping("docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets", "/etc/kafka/secrets", BindMode.READ_ONLY)); + .withClasspathResourceMapping("docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets", "/etc/kafka/secrets", BindMode.READ_ONLY)); builder.configureContainer(Kafka.SCHEMA_REGISTRY, container -> container .withStartupAttempts(3) .withStartupTimeout(Duration.ofMinutes(5)) @@ -73,7 +73,7 @@ public void extendEnvironment(Environment.Builder builder) .withEnv("SCHEMA_REGISTRY_SSL_KEYSTORE_TYPE", "JKS") .withEnv("SCHEMA_REGISTRY_SSL_KEY_PASSWORD", "confluent") .withEnv("SCHEMA_REGISTRY_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM", "https") - .withClasspathResourceMapping("docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets", "/var/private/ssl", BindMode.READ_ONLY)); + .withClasspathResourceMapping("docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets", "/var/private/ssl", BindMode.READ_ONLY)); } @Override diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java index 455016f066c4..5cdea17d8290 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java @@ -69,8 +69,8 @@ public final class Standard private static final int COLLECTOR_GRPC_PORT = 4317; public static final String CONTAINER_HEALTH_D = "/etc/health.d/"; - public static final String CONTAINER_CONF_ROOT = "/docker/presto-product-tests/"; - public static final String CONTAINER_TRINO_ETC = CONTAINER_CONF_ROOT + "conf/presto/etc"; + public static final String CONTAINER_CONF_ROOT = "/docker/trino-product-tests/"; + public static final String CONTAINER_TRINO_ETC = CONTAINER_CONF_ROOT + "conf/trino/etc"; public static final String CONTAINER_TRINO_JVM_CONFIG = CONTAINER_TRINO_ETC + "/jvm.config"; public static final String CONTAINER_TRINO_SECRETS_CONFIG = CONTAINER_TRINO_ETC + "/secrets.toml"; public static final String CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES = CONTAINER_TRINO_ETC + "/access-control.properties"; @@ -79,7 +79,7 @@ public final class Standard * @deprecated please use {@link EnvironmentContainers#configureTempto} instead. */ @Deprecated - public static final String CONTAINER_TEMPTO_PROFILE_CONFIG = "/docker/presto-product-tests/conf/tempto/tempto-configuration-profile-config-file.yaml"; + public static final String CONTAINER_TEMPTO_PROFILE_CONFIG = "/docker/trino-product-tests/conf/tempto/tempto-configuration-profile-config-file.yaml"; private final DockerFiles dockerFiles; private final PortBinder portBinder; @@ -122,7 +122,7 @@ public void extendEnvironment(Environment.Builder builder) } builder.addContainers(createTrinoCoordinator(), createTestsContainer()); - // default catalogs copied from /docker/presto-product-tests + // default catalogs copied from /docker/trino-product-tests builder.addConnector("blackhole"); builder.addConnector("jmx"); builder.addConnector("system"); @@ -180,7 +180,7 @@ private DockerContainer createTrinoCoordinator() private DockerContainer createTestsContainer() { return new DockerContainer("ghcr.io/trinodb/testing/almalinux9-oj17:" + imagesVersion, TESTS) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests") + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/trino-product-tests") .withCommand("bash", "-xeuc", "echo 'No command provided' >&2; exit 69") .waitingFor(new WaitAllStrategy()) // don't wait .withStartupCheckStrategy(new IsRunningStartupCheckStrategy()); @@ -192,14 +192,14 @@ public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File DockerContainer container = new DockerContainer(dockerImageName, logicalName) .withNetworkAliases(logicalName + ".docker.cluster") .withExposedLogPaths("/var/trino/var/log", "/var/log/container-health.log") - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests") - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/presto/etc/jvm.config")), CONTAINER_TRINO_JVM_CONFIG) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/presto/etc/secrets.toml")), CONTAINER_TRINO_SECRETS_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/trino-product-tests") + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/trino/etc/jvm.config")), CONTAINER_TRINO_JVM_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/trino/etc/secrets.toml")), CONTAINER_TRINO_SECRETS_CONFIG) .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("health-checks/trino-health-check.sh")), CONTAINER_HEALTH_D + "trino-health-check.sh") // the server package is hundreds MB and file system bind is much more efficient .withFileSystemBind(serverPackage.getPath(), "/docker/presto-server.tar.gz", READ_ONLY) .withEnv("JAVA_HOME", jdkProvider.getJavaHome()) - .withCommand("/docker/presto-product-tests/run-presto.sh") + .withCommand("/docker/trino-product-tests/run-presto.sh") .withStartupCheckStrategy(new IsRunningStartupCheckStrategy()) .waitingForAll(forLogMessage(".*======== SERVER STARTED ========.*", 1), forHealthcheck()) .withStartupTimeout(Duration.ofMinutes(5)); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java index 07cf2764cce2..3240e3ca3a94 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigApacheHive3.java @@ -25,6 +25,6 @@ public String getHadoopBaseImage() @Override public String getTemptoEnvironmentConfigFile() { - return "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-hms-only.yaml"; + return "/docker/trino-product-tests/conf/tempto/tempto-configuration-for-hms-only.yaml"; } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java index 262d257f7630..0f29308f24dc 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java @@ -84,7 +84,7 @@ public void extendEnvironment(Environment.Builder builder) container.setDockerImageName(dockerImageName); container.withCopyFileToContainer( forHostPath(getCoreSiteOverrideXml()), - "/docker/presto-product-tests/conf/environment/multinode-azure/core-site-overrides.xml"); + "/docker/trino-product-tests/conf/environment/multinode-azure/core-site-overrides.xml"); container.withCopyFileToContainer( forHostPath(configDir.getPath("apply-azure-config.sh")), CONTAINER_HADOOP_INIT_D + "apply-azure-config.sh"); @@ -106,7 +106,7 @@ public void extendEnvironment(Environment.Builder builder) .withEnv("ABFS_ACCOUNT", abfsAccount) .withEnv("ABFS_ACCESS_KEY", abfsAccessKey)); - String temptoConfig = "/docker/presto-product-tests/conf/tempto/tempto-configuration-abfs.yaml"; + String temptoConfig = "/docker/trino-product-tests/conf/tempto/tempto-configuration-abfs.yaml"; builder.configureContainer(TESTS, container -> container .withEnv("ABFS_CONTAINER", abfsContainer) .withEnv("ABFS_ACCOUNT", abfsAccount) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java index 977089e27f5d..3fab018afb8c 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java @@ -99,10 +99,10 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(HADOOP, container -> { container.withCopyFileToContainer( forHostPath(getCoreSiteOverrideXml(containerGcpCredentialsFile)), - "/docker/presto-product-tests/conf/environment/multinode-gcs/core-site-overrides.xml"); + "/docker/trino-product-tests/conf/environment/multinode-gcs/core-site-overrides.xml"); container.withCopyFileToContainer( forHostPath(getHiveSiteOverrideXml(gcpStorageBucket)), - "/docker/presto-product-tests/conf/environment/multinode-gcs/hive-site-overrides.xml"); + "/docker/trino-product-tests/conf/environment/multinode-gcs/hive-site-overrides.xml"); container.withCopyFileToContainer( forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/apply-gcs-config.sh")), CONTAINER_HADOOP_INIT_D + "apply-gcs-config.sh"); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java index 0d2af492c58b..66360d8a2d89 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java @@ -57,7 +57,7 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(TESTS, container -> container .withCopyFileToContainer( forHostPath(configDir.getPath("secrets")), - "/docker/presto-product-tests/conf/tempto/secrets")); + "/docker/trino-product-tests/conf/tempto/secrets")); } private void addCatalogs(DockerContainer container) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresqlSpooling.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresqlSpooling.java index 58713ef1b36c..8d408d161578 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresqlSpooling.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePostgresqlSpooling.java @@ -88,7 +88,7 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(MINIO_CONTAINER_NAME, container -> container.withCopyFileToContainer(forHostPath(minioBucketDirectory), "/data/" + S3_SPOOLING_BUCKET)); - String temptoConfig = "/docker/presto-product-tests/conf/tempto/tempto-configuration-spooling.yaml"; + String temptoConfig = "/docker/trino-product-tests/conf/tempto/tempto-configuration-spooling.yaml"; builder.configureContainer(TESTS, testContainer -> { testContainer .withCopyFileToContainer(forHostPath(configDir.getPath("tempto-configuration.yaml")), temptoConfig) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSecretsProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSecretsProvider.java index 496ce948d690..ecab068efdb0 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSecretsProvider.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSecretsProvider.java @@ -97,7 +97,7 @@ private void configureTrinoContainer(DockerContainer container, String role) container .withCopyFileToContainer( forHostPath(configDir.getPath("secrets.toml")), - "/docker/presto-product-tests/conf/presto/etc/secrets.toml") + "/docker/trino-product-tests/conf/trino/etc/secrets.toml") .withCopyFileToContainer( forHostPath(configDir.getPath("generateSecrets.sh")), "/docker/presto-init.d/generateSecrets.sh") diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java index 76349ccebd28..12ee4047f532 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java @@ -69,7 +69,7 @@ public void extendEnvironment(Environment.Builder builder, Map e private void configureCompatibilityTestContainer(Environment.Builder builder, Config config) { boolean java22 = config.getCompatibilityTestVersion() >= 447; - String jvmConfig = java22 ? "conf/presto/etc/jvm.config" : "conf/presto/etc/jvm-pre-jdk22.config"; + String jvmConfig = "conf/trino/etc/" + (java22 ? "jvm.config" : "jvm-pre-jdk22.config"); String dockerImage = config.getCompatibilityTestDockerImage(); String containerConfigDir = getConfigurationDirectory(dockerImage); DockerContainer container = new DockerContainer(dockerImage, COMPATIBILTY_TEST_CONTAINER_NAME) @@ -78,7 +78,7 @@ private void configureCompatibilityTestContainer(Environment.Builder builder, Co .withCopyFileToContainer(forHostPath(configDir.getPath(getConfigFileFor(dockerImage))), containerConfigDir + "config.properties") .withCopyFileToContainer(forHostPath(configDir.getPath(getHiveConfigFor(dockerImage))), containerConfigDir + "catalog/hive.properties") .withCopyFileToContainer(forHostPath(configDir.getPath(getIcebergConfigFor(dockerImage))), containerConfigDir + "catalog/iceberg.properties") - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests") + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/trino-product-tests") .withStartupCheckStrategy(new IsRunningStartupCheckStrategy()) .waitingForAll(forLogMessage(".*======== SERVER STARTED ========.*", 1), forHealthcheck()) .withStartupTimeout(Duration.ofMinutes(5)); @@ -135,7 +135,7 @@ private void configureTestsContainer(Environment.Builder builder, Config config) builder.configureContainer(TESTS, container -> container .withCopyFileToContainer( forHostPath(configDir.getPath(temptoConfig)), - "/docker/presto-product-tests/conf/tempto/tempto-configuration-profile-config-file.yaml")); + "/docker/trino-product-tests/conf/tempto/tempto-configuration-profile-config-file.yaml")); } protected int getVersionFromDockerImageName(String dockerImageName) diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/gsheets.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/gsheets.properties deleted file mode 100644 index d6ff19c835ec..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/gsheets.properties +++ /dev/null @@ -1,3 +0,0 @@ -connector.name=gsheets -credentials-path=/docker/presto-product-tests/conf/presto/etc/catalog/google-sheets-auth.json -metadata-sheet-id=exampleId diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh deleted file mode 100755 index 049205a25d59..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -echo "Applying GCS core-site configuration overrides" -apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/presto-product-tests/conf/environment/multinode-gcs/core-site-overrides.xml" -apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/multinode-gcs/hive-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/phoenix.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/phoenix.properties deleted file mode 100644 index c62caff6c5b4..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/phoenix.properties +++ /dev/null @@ -1,3 +0,0 @@ -connector.name=phoenix5 -phoenix.connection-url=jdbc:phoenix:phoenix:2181:/hbase -phoenix.config.resources=/docker/presto-product-tests/conf/presto/etc/hbase-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh deleted file mode 100755 index b29bcc092b1f..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-acid/apply-hive-config.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -echo "Applying HDP3 hive-site configuration overrides" -apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/singlenode-hive-acid/hive-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/apply-hive-config-for-iceberg.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/apply-hive-config-for-iceberg.sh deleted file mode 100755 index 2dc1e54559ea..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/apply-hive-config-for-iceberg.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -echo "Applying hive-site configuration overrides for Spark" -apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/hive-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh deleted file mode 100755 index cc557a4d524a..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/apply-hive-config-for-iceberg.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -echo "Applying hive-site configuration overrides for Spark" -apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/hive-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/add_column_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/add_column_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/add_column_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/add_column_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/camelCaseSchema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/camelCaseSchema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/camelCaseSchema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/camelCaseSchema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/change_column_type_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/change_column_type_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/change_column_type_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/change_column_type_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/column_with_long_type_definition_data.avro b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/column_with_long_type_definition_data.avro similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/column_with_long_type_definition_data.avro rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/column_with_long_type_definition_data.avro diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/column_with_long_type_definition_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/column_with_long_type_definition_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/column_with_long_type_definition_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/column_with_long_type_definition_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/incompatible_type_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/incompatible_type_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/incompatible_type_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/incompatible_type_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/invalid_default.avro b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/invalid_default.avro similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/invalid_default.avro rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/invalid_default.avro diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/invalid_default.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/invalid_default.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/invalid_default.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/invalid_default.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/original_data.avro b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/original_data.avro similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/original_data.avro rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/original_data.avro diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/original_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/original_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/original_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/original_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/remove_column_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/remove_column_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/remove_column_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/remove_column_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/rename_column_schema.avsc b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/rename_column_schema.avsc similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/avro/rename_column_schema.avsc rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/avro/rename_column_schema.avsc diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms-with-impersonation/hiveserver2-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms-with-impersonation/hiveserver2-site.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms-with-impersonation/hiveserver2-site.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms-with-impersonation/hiveserver2-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms-with-impersonation/kms-acls.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms-with-impersonation/kms-acls.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms-with-impersonation/kms-acls.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms-with-impersonation/kms-acls.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/hive-disable-key-provider-cache-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/hive-disable-key-provider-cache-site.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/hive-disable-key-provider-cache-site.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/hive-disable-key-provider-cache-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/kms-core-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/kms-core-site.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/kms-core-site.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/kms-core-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml similarity index 96% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml index 3241faf944c2..aee04ef29ff0 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos-kms/tempto-configuration.yaml @@ -32,7 +32,7 @@ databases: # 2) It should have the required privileges (such as SELECT) on Hive tables (such as hive.default.nation) jdbc_user: hdfs - https_keystore_path: /docker/presto-product-tests/conf/presto/etc/docker.cluster.jks + https_keystore_path: /docker/trino-product-tests/conf/trino/etc/docker.cluster.jks https_keystore_password: '123456' cli_kerberos_authentication: true cli_kerberos_principal: presto-client/presto-master.docker.cluster@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/config.properties similarity index 79% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/config.properties index facbc5966c27..a0ba029bead0 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/config.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/config.properties @@ -14,11 +14,11 @@ http-server.authentication.krb5.service-name=presto-server http-server.http.enabled=false http-server.https.enabled=true http-server.https.port=7778 -http-server.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +http-server.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks http-server.https.keystore.key=123456 http-server.authentication.krb5.keytab=/etc/trino/conf/presto-server.keytab internal-communication.https.required=true internal-communication.shared-secret=internal-shared-secret -internal-communication.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +internal-communication.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks internal-communication.https.keystore.key=123456 diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/create_kerberos_credential_cache_files.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/create_kerberos_credential_cache_files.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/create_kerberos_credential_cache_files.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/create_kerberos_credential_cache_files.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/krb5.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/krb5.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/krb5.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/krb5.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/tempto-configuration.yaml similarity index 96% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/tempto-configuration.yaml index 64f7337fa9f0..3f769a3da110 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop-kerberos/tempto-configuration.yaml +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop-kerberos/tempto-configuration.yaml @@ -32,7 +32,7 @@ databases: # 2) It should have the required privileges (such as SELECT) on Hive tables (such as hive.default.nation) jdbc_user: hdfs - https_keystore_path: /docker/presto-product-tests/conf/presto/etc/docker.cluster.jks + https_keystore_path: /docker/trino-product-tests/conf/trino/etc/docker.cluster.jks https_keystore_password: '123456' cli_kerberos_authentication: true cli_kerberos_principal: presto-client/presto-master.docker.cluster@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/apply-config-overrides.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/apply-config-overrides.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/apply-config-overrides.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/apply-config-overrides.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hadoop-run.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hadoop-run.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hadoop-run.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hadoop-run.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive.properties similarity index 83% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive.properties index 8365950696c4..9a958851bfd7 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive.properties @@ -1,6 +1,6 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml hive.allow-register-partition-procedure=true hive.metastore-cache-ttl=0s hive.fs.cache.max-size=10 diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_timestamp_nanos.properties similarity index 72% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_timestamp_nanos.properties index 6066079835f1..3c4d649dcbbe 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_timestamp_nanos.properties @@ -1,6 +1,6 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml hive.metastore-cache-ttl=0s hive.hive-views.enabled=true hive.timestamp-precision=NANOSECONDS diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_external_writes.properties similarity index 80% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_external_writes.properties index daef040a34c1..1bde59c1e7ef 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_external_writes.properties @@ -1,6 +1,6 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml hive.allow-register-partition-procedure=true hive.metastore-cache-ttl=0s hive.fs.cache.max-size=10 diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties similarity index 75% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties index 37174c20c55b..15ece26afe4c 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties @@ -1,6 +1,6 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml hive.metastore-cache-ttl=0s hive.fs.cache.max-size=10 hive.hive-views.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/iceberg.properties similarity index 64% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/iceberg.properties index 06053e022ffb..73e68514cf1c 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hadoop/iceberg.properties @@ -1,6 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml iceberg.file-format=PARQUET iceberg.register-table-procedure.enabled=true fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/http-proxy/httpd.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/http-proxy/httpd.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/http-proxy/httpd.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/http-proxy/httpd.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/create-certs.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/create-certs.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/create-certs.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/create-certs.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/proxy.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/proxy.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/proxy.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/proxy.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/proxy.pem b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/proxy.pem similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/proxy.pem rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/proxy.pem diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/truststore.jks b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/truststore.jks similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/cert/truststore.jks rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/cert/truststore.jks diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/httpd.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/httpd.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/https-proxy/httpd.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/https-proxy/httpd.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/generate.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/generate.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/generate.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/generate.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/hydra.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/hydra.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/hydra.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/hydra.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/hydra.pem b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/hydra.pem similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/hydra.pem rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/hydra.pem diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/trino.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/trino.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/trino.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/trino.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/trino.pem b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/trino.pem similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/trino.pem rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/trino.pem diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/truststore.jks b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/truststore.jks similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/cert/truststore.jks rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/cert/truststore.jks diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/login_and_consent_server.py b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/login_and_consent_server.py similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/login_and_consent_server.py rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/login_and_consent_server.py diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml similarity index 88% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml index a44081af00ba..c0659957d287 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/hydra-identity-provider/tempto-configuration-for-docker-oauth2.yaml @@ -10,5 +10,5 @@ databases: SSLTrustStorePath=${databases.presto.https_keystore_path}&\ SSLTrustStorePassword=${databases.presto.https_keystore_password}&\ externalAuthentication=true" - https_keystore_path: /docker/presto-product-tests/truststore.jks + https_keystore_path: /docker/trino-product-tests/truststore.jks https_keystore_password: '123456' diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log4j-kafka.properties.template b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log4j-kafka.properties.template similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log4j-kafka.properties.template rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log4j-kafka.properties.template diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log4j-schema-registry.properties.template b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log4j-schema-registry.properties.template similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log4j-schema-registry.properties.template rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/kafka/log4j-schema-registry.properties.template diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/minio/apply-minio-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/minio/apply-minio-config.sh similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/minio/apply-minio-config.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/minio/apply-minio-config.sh index d7efd158ccce..059b9d0b7cd7 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/minio/apply-minio-config.sh +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/minio/apply-minio-config.sh @@ -9,4 +9,4 @@ fail() { echo "Applying configuration overrides from minio-core-site-overrides.xml" -apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/presto-product-tests/common/minio/minio-core-site-overrides.xml" || fail "Could not apply minio-core-site-overrides.xml" +apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/trino-product-tests/common/minio/minio-core-site-overrides.xml" || fail "Could not apply minio-core-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/minio/minio-core-site-overrides.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/minio/minio-core-site-overrides.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/minio/minio-core-site-overrides.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/minio/minio-core-site-overrides.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/spark/log4j2.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/spark/log4j2.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard-multinode/multinode-master-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-master-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard-multinode/multinode-master-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard-multinode/multinode-worker-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard-multinode/multinode-worker-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard-multinode/multinode-worker-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/access-control.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/access-control.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/access-control.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/access-control.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/set-trino-cli.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/set-trino-cli.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/standard/set-trino-cli.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/standard/set-trino-cli.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/task-retries-multinode/multinode-master-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/task-retries-multinode/multinode-master-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/task-retries-multinode/multinode-master-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/task-retries-multinode/multinode-master-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/task-retries-multinode/multinode-worker-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/task-retries-multinode/multinode-worker-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/task-retries-multinode/multinode-worker-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/common/task-retries-multinode/multinode-worker-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/accumulo.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/accumulo.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/accumulo.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/accumulo.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/bigquery.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/bigquery.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/bigquery.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/bigquery.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/cassandra.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/cassandra.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/cassandra.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/cassandra.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/clickhouse.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/clickhouse.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/clickhouse.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/clickhouse.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/delta_lake.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/delta_lake.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/delta_lake.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/delta_lake.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/druid.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/druid.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/druid.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/druid.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/elasticsearch.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/elasticsearch.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/elasticsearch.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/elasticsearch.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/exasol.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/exasol.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/exasol.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/exasol.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/google-sheets-auth.json b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/google-sheets-auth.json similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/google-sheets-auth.json rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/google-sheets-auth.json diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/gsheets.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/gsheets.properties new file mode 100644 index 000000000000..4f635fea1e37 --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/gsheets.properties @@ -0,0 +1,3 @@ +connector.name=gsheets +credentials-path=/docker/trino-product-tests/conf/trino/etc/catalog/google-sheets-auth.json +metadata-sheet-id=exampleId diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/hive.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/hive.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hudi.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/hudi.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hudi.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/hudi.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/ignite.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/ignite.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/ignite.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/ignite.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/jvm.config similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/jvm.config diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kafka.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kafka.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kafka.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kinesis.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kinesis.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kinesis.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kinesis.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kudu.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kudu.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/kudu.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/kudu.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mariadb.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mariadb.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mariadb.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mariadb.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/memory.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/memory.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/memory.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/memory.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mongodb.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mongodb.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mongodb.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mongodb.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mysql.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mysql.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/mysql.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/mysql.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/opensearch.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/opensearch.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/opensearch.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/opensearch.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/oracle.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/oracle.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/oracle.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/oracle.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/phoenix5.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/phoenix5.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/phoenix5.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/phoenix5.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/pinot.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/pinot.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/pinot.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/pinot.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/postgresql.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/postgresql.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/postgresql.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/postgresql.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/prometheus-bearer.txt b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/prometheus-bearer.txt similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/prometheus-bearer.txt rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/prometheus-bearer.txt diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/prometheus.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/prometheus.properties similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/prometheus.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/prometheus.properties index 2ae2a5292106..1517bd749b72 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/prometheus.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/prometheus.properties @@ -3,5 +3,5 @@ prometheus.uri=http://host1.invalid:9090 prometheus.query.chunk.size.duration=1d prometheus.max.query.range.duration=21d prometheus.cache.ttl=30s -prometheus.bearer.token.file=/docker/presto-product-tests/conf/presto/etc/catalog/prometheus-bearer.txt +prometheus.bearer.token.file=/docker/trino-product-tests/conf/trino/etc/catalog/prometheus-bearer.txt prometheus.read-timeout=10s diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/raptor_legacy.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/raptor_legacy.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/raptor_legacy.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/raptor_legacy.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/redis.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/redis.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/redis.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/redis.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/redshift.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/redshift.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/redshift.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/redshift.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/singlestore.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/singlestore.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/singlestore.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/singlestore.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/snowflake.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/snowflake.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/snowflake.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/snowflake.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/sqlserver.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/sqlserver.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/sqlserver.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/sqlserver.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/tpcds.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/tpcds.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/tpcds.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/tpcds.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/trino_thrift.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/trino_thrift.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/trino_thrift.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-all/trino_thrift.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/apply-azure-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/apply-azure-config.sh similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/apply-azure-config.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/apply-azure-config.sh index a4a30ddc1cf1..2ac980f58773 100755 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/apply-azure-config.sh +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/apply-azure-config.sh @@ -2,4 +2,4 @@ set -exuo pipefail echo "Applying HDP3 core-site configuration overrides" -apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/presto-product-tests/conf/environment/multinode-azure/core-site-overrides.xml" +apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/trino-product-tests/conf/environment/multinode-azure/core-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/core-site-overrides-template.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/core-site-overrides-template.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/core-site-overrides-template.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/core-site-overrides-template.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/delta.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/delta.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/delta.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/hive.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/hive.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/spark-defaults.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/spark-defaults.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/spark-defaults.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/spark-defaults.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/update-location.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/update-location.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-azure/update-location.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-azure/update-location.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cassandra/cassandra.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-cassandra/cassandra.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-cassandra/cassandra.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-cassandra/cassandra.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/clickhouse.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/clickhouse.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/clickhouse.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/clickhouse.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/metrika.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/metrika.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/metrika.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/metrika.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/test.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/test.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-clickhouse/test.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-clickhouse/test.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/delta.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/delta.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/delta.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/hive.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/hive.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-databricks-http-hms/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-databricks-http-hms/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-exasol/exasol.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-exasol/exasol.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-exasol/exasol.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-exasol/exasol.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-exasol/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-exasol/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-exasol/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-exasol/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh new file mode 100755 index 000000000000..4ea1bce7a47d --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/apply-gcs-config.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -exuo pipefail + +echo "Applying GCS core-site configuration overrides" +apply-site-xml-override /etc/hadoop/conf/core-site.xml "/docker/trino-product-tests/conf/environment/multinode-gcs/core-site-overrides.xml" +apply-site-xml-override /etc/hive/conf/hive-site.xml "/docker/trino-product-tests/conf/environment/multinode-gcs/hive-site-overrides.xml" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/core-site-overrides-template.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/core-site-overrides-template.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/core-site-overrides-template.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/core-site-overrides-template.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/delta.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/delta.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/delta.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive-site-overrides-template.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/hive-site-overrides-template.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive-site-overrides-template.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/hive-site-overrides-template.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/hive.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/hive.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/spark-defaults.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/spark-defaults.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/spark-defaults.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/spark-defaults.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-gcs/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-gcs/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-hive-cached/hive.properties similarity index 72% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-hive-cached/hive.properties index 3a9d689ab7ad..ed9b789f1367 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-hive-cached/hive.properties @@ -1,5 +1,5 @@ connector.name=hive -hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +hive.config.resources=/docker/trino-product-tests/conf/trino/etc/hive-default-fs-site.xml hive.metastore.uri=thrift://hadoop-master:9083 fs.hadoop.enabled=true fs.cache.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-iceberg-minio-cached/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-iceberg-minio-cached/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-iceberg-minio-cached/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-iceberg-minio-cached/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/ignite.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/ignite.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/ignite.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/ignite.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/jvm.config similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/jvm.config diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-ignite/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties similarity index 93% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/kafka.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties index bd6631b76e9c..cfcf6203c02c 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/kafka.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties @@ -20,4 +20,4 @@ kafka.table-names=product_tests.read_simple_key_and_value,\ product_tests.read_basic_datatypes_protobuf,\ product_tests.read_basic_structural_datatypes_protobuf kafka.nodes=kafka:9092 -kafka.table-description-dir=/docker/presto-product-tests/conf/presto/etc/catalog/kafka +kafka.table-description-dir=/docker/trino-product-tests/conf/trino/etc/catalog/kafka diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/kafka_schema_registry.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-confluent-license/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka-configuration.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka-configuration.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka-configuration.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka-configuration.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties similarity index 87% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties index f9e1ec21ba2d..113b340d0e2b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka.properties @@ -20,5 +20,5 @@ kafka.table-names=product_tests.read_simple_key_and_value,\ product_tests.read_basic_datatypes_protobuf,\ product_tests.read_basic_structural_datatypes_protobuf kafka.nodes=kafka:9092 -kafka.table-description-dir=/docker/presto-product-tests/conf/presto/etc/catalog/kafka -kafka.config.resources=/docker/presto-product-tests/conf/presto/etc/kafka-configuration.properties +kafka.table-description-dir=/docker/trino-product-tests/conf/trino/etc/catalog/kafka +kafka.config.resources=/docker/trino-product-tests/conf/trino/etc/kafka-configuration.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties index 26377bf0ae7d..b6b61549baef 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_schema_registry.properties @@ -3,4 +3,4 @@ kafka.nodes=kafka:9092 kafka.table-description-supplier=confluent kafka.confluent-schema-registry-url=http://schema-registry:8081 kafka.default-schema=product_tests -kafka.config.resources=/docker/presto-product-tests/conf/presto/etc/kafka-configuration.properties +kafka.config.resources=/docker/trino-product-tests/conf/trino/etc/kafka-configuration.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/kafka_server_jaas.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-sasl-plaintext/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-sasl-plaintext/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties similarity index 82% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties index ccfe80589327..0aa73cdf1b5c 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka.properties @@ -20,13 +20,13 @@ kafka.table-names=product_tests.read_simple_key_and_value,\ product_tests.read_basic_datatypes_protobuf,\ product_tests.read_basic_structural_datatypes_protobuf kafka.nodes=kafka:9092 -kafka.table-description-dir=/docker/presto-product-tests/conf/presto/etc/catalog/kafka +kafka.table-description-dir=/docker/trino-product-tests/conf/trino/etc/catalog/kafka kafka.security-protocol=SSL kafka.ssl.keystore.type=JKS -kafka.ssl.keystore.location=/docker/presto-product-tests/conf/presto/etc/catalog/secrets/kafka.client.keystore +kafka.ssl.keystore.location=/docker/trino-product-tests/conf/trino/etc/catalog/secrets/kafka.client.keystore kafka.ssl.keystore.password=confluent kafka.ssl.truststore.type=JKS -kafka.ssl.truststore.location=/docker/presto-product-tests/conf/presto/etc/catalog/secrets/kafka.client.truststore +kafka.ssl.truststore.location=/docker/trino-product-tests/conf/trino/etc/catalog/secrets/kafka.client.truststore kafka.ssl.truststore.password=confluent kafka.ssl.key.password=confluent kafka.ssl.endpoint-identification-algorithm=https diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties index 5fddd5c41db5..4d3efaca6f74 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/kafka_schema_registry.properties @@ -5,10 +5,10 @@ kafka.confluent-schema-registry-url=http://schema-registry:8081 kafka.default-schema=product_tests kafka.security-protocol=SSL kafka.ssl.keystore.type=JKS -kafka.ssl.keystore.location=/docker/presto-product-tests/conf/presto/etc/catalog/secrets/kafka.client.keystore +kafka.ssl.keystore.location=/docker/trino-product-tests/conf/trino/etc/catalog/secrets/kafka.client.keystore kafka.ssl.keystore.password=confluent kafka.ssl.truststore.type=JKS -kafka.ssl.truststore.location=/docker/presto-product-tests/conf/presto/etc/catalog/secrets/kafka.client.truststore +kafka.ssl.truststore.location=/docker/trino-product-tests/conf/trino/etc/catalog/secrets/kafka.client.truststore kafka.ssl.truststore.password=confluent kafka.ssl.key.password=confluent kafka.ssl.endpoint-identification-algorithm=https diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore similarity index 57% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore index cf132b981a59..1d4a0fe9e051 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/.gitignore @@ -1,5 +1,5 @@ # automate certs generation in a future PR instead of committing them in git -# docker run --rm -v "$PWD/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets":/secrets -w /secrets confluentinc/cp-kafka ./create-certs.sh +# docker run --rm -v "$PWD/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets":/secrets -w /secrets confluentinc/cp-kafka ./create-certs.sh # *_creds # *.jks *.crt diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_keystore_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_keystore_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_keystore_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_keystore_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_sslkey_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_sslkey_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_sslkey_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_sslkey_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_truststore_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_truststore_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_truststore_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/broker1_truststore_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_keystore_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_keystore_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_keystore_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_keystore_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_sslkey_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_sslkey_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_sslkey_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_sslkey_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_truststore_creds b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_truststore_creds similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_truststore_creds rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/client_truststore_creds diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/create-certs.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/create-certs.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/create-certs.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/create-certs.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.keystore b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.keystore similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.keystore rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.keystore diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.truststore b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.truststore similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.truststore rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.broker1.truststore diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.keystore b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.keystore similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.keystore rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.keystore diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.truststore b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.truststore similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.truststore rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/secrets/kafka.client.truststore diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml similarity index 65% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml index a67984bdc989..9956871249ec 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka-ssl/tempto-configuration.yaml @@ -9,9 +9,9 @@ databases: security.protocol: "SSL" ssl.endpoint.identification.algorithm: "https" ssl.key.password: "confluent" - ssl.keystore.location: "/docker/presto-product-tests/conf/tempto/secrets/kafka.client.keystore" + ssl.keystore.location: "/docker/trino-product-tests/conf/tempto/secrets/kafka.client.keystore" ssl.keystore.password: "confluent" ssl.keystore.type: "JKS" - ssl.truststore.location: "/docker/presto-product-tests/conf/tempto/secrets/kafka.client.truststore" + ssl.truststore.location: "/docker/trino-product-tests/conf/tempto/secrets/kafka.client.truststore" ssl.truststore.password: "confluent" ssl.truststore.type: "JKS" diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/kafka.properties similarity index 93% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/kafka.properties index bd6631b76e9c..cfcf6203c02c 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka-confluent-license/kafka.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/kafka.properties @@ -20,4 +20,4 @@ kafka.table-names=product_tests.read_simple_key_and_value,\ product_tests.read_basic_datatypes_protobuf,\ product_tests.read_basic_structural_datatypes_protobuf kafka.nodes=kafka:9092 -kafka.table-description-dir=/docker/presto-product-tests/conf/presto/etc/catalog/kafka +kafka.table-description-dir=/docker/trino-product-tests/conf/trino/etc/catalog/kafka diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/kafka_schema_registry.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/kafka_schema_registry.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/kafka_schema_registry.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/kafka_schema_registry.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kafka/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kafka/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/kerberos_init.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/kerberos_init.sh similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/kerberos_init.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/kerberos_init.sh diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/krb5.conf b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/krb5.conf similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/krb5.conf rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/krb5.conf diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/kudu.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/kudu.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-kerberos-kudu/kudu.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-kerberos-kudu/kudu.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mariadb/mariadb.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mariadb/mariadb.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mariadb/mariadb.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mariadb/mariadb.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mariadb/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mariadb/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mariadb/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mariadb/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-cached/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-cached/delta.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-cached/delta.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-cached/delta.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/exchange-manager.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/exchange-manager.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/exchange-manager.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/exchange-manager.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake-task-retries-filesystem/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/delta.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/delta.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/delta.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/hive.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/hive.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/hive.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/iceberg.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/iceberg.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/iceberg.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/memory.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/memory.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-minio-data-lake/memory.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-minio-data-lake/memory.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mysql/mysql.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mysql/mysql.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-mysql/mysql.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-mysql/mysql.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-parquet/tpcds.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-parquet/tpcds.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-parquet/tpcds.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-parquet/tpcds.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-parquet/tpch.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-parquet/tpch.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-parquet/tpch.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-parquet/tpch.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/hbase-site.xml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/hbase-site.xml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/hbase-site.xml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/hbase-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/phoenix.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/phoenix.properties new file mode 100644 index 000000000000..13d2f535d23e --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/phoenix.properties @@ -0,0 +1,3 @@ +connector.name=phoenix5 +phoenix.connection-url=jdbc:phoenix:phoenix:2181:/hbase +phoenix.config.resources=/docker/trino-product-tests/conf/trino/etc/hbase-site.xml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-phoenix5/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-phoenix5/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/coordinator-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/coordinator-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/coordinator-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/coordinator-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/spooling-manager.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/spooling-manager.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/spooling-manager.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/spooling-manager.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/tempto-configuration.yaml b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/tempto-configuration.yaml similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/tempto-configuration.yaml rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/tempto-configuration.yaml diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/worker-config.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/worker-config.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql-spooling/worker-config.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql-spooling/worker-config.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql/postgresql.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql/postgresql.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-postgresql/postgresql.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-postgresql/postgresql.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/authenticator.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/authenticator.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/authenticator.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/authenticator.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/catalog/postgresql.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/catalog/postgresql.properties similarity index 100% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/catalog/postgresql.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/catalog/postgresql.properties diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-master.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-master.properties similarity index 77% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-master.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-master.properties index c929813a2ce1..ad321c60e047 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-master.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-master.properties @@ -12,7 +12,7 @@ query.max-memory-per-node=1GB http-server.http.enabled=false http-server.https.enabled=true http-server.https.port=7778 -http-server.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +http-server.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks http-server.https.keystore.key=${keystore:keystore_password} http-server.authentication.type=PASSWORD @@ -20,5 +20,5 @@ password-authenticator.config-files=etc/authenticator.properties internal-communication.https.required=true internal-communication.shared-secret=${keystore:shared_secret} -internal-communication.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +internal-communication.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks internal-communication.https.keystore.key=${keystore:keystore_password} diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties similarity index 72% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties index 805d698268a9..714752b3c389 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/config-worker.properties @@ -11,10 +11,10 @@ query.max-memory-per-node=1GB http-server.http.enabled=false http-server.https.enabled=true http-server.https.port=7778 -http-server.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +http-server.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks http-server.https.keystore.key=${keystore:keystore_password} internal-communication.https.required=true internal-communication.shared-secret=${keystore:shared_secret} -internal-communication.https.keystore.path=/docker/presto-product-tests/conf/presto/etc/docker.cluster.jks +internal-communication.https.keystore.path=/docker/trino-product-tests/conf/trino/etc/docker.cluster.jks internal-communication.https.keystore.key=${keystore:keystore_password} diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh similarity index 67% rename from testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh rename to testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh index f377ba95511c..ecca160b2c6d 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/multinode-secrets-provider/generateSecrets.sh @@ -2,7 +2,7 @@ # Store password for Trino server Keystore keytool -importpass -storetype pkcs12 -alias keystore_password \ --keystore /docker/presto-product-tests/conf/presto/etc/credential.jckes \ +-keystore /docker/trino-product-tests/conf/trino/etc/credential.jckes \ -storepass password< @@ -54,7 +54,7 @@ public class TestAvroSchemaStrictness * java.jar avro-tools-1.8.2.jar fromjson --schema-file "$SCHEMA_FILE" data.json > invalid_default.avro * } */ - private static final Path ILLEGAL_UNION_DEFAULT_DATA = Path.of("/docker/presto-product-tests/avro/invalid_default.avro"); + private static final Path ILLEGAL_UNION_DEFAULT_DATA = Path.of("/docker/trino-product-tests/avro/invalid_default.avro"); @Inject private HdfsClient hdfsClient; diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java index 6eed32245921..94368abc6094 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSchemaUrl.java @@ -67,7 +67,7 @@ private void saveResourceOnHdfs(String resource, String location) throws IOException { hdfsClient.delete(location); - try (InputStream inputStream = newInputStream(Paths.get("/docker/presto-product-tests", resource))) { + try (InputStream inputStream = newInputStream(Paths.get("/docker/trino-product-tests", resource))) { hdfsClient.saveFile(location, inputStream); } } @@ -76,7 +76,7 @@ private void saveResourceOnHdfs(String resource, String location) public Object[][] avroSchemaLocations() { return new Object[][] { - {"file:///docker/presto-product-tests/avro/original_schema.avsc"}, // mounted in hadoop and presto containers + {"file:///docker/trino-product-tests/avro/original_schema.avsc"}, // mounted in hadoop and presto containers {"hdfs://hadoop-master:9000/user/hive/warehouse/TestAvroSchemaUrl/schemas/original_schema.avsc"}, {"hdfs:///user/hive/warehouse/TestAvroSchemaUrl/schemas/original_schema.avsc"}, {"/user/hive/warehouse/TestAvroSchemaUrl/schemas/original_schema.avsc"}, // `avro.schema.url` can actually be path on HDFS (not URL) diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java index 7cd4cd320b67..7b43801bddbe 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestAvroSymlinkInputFormat.java @@ -148,7 +148,7 @@ private void saveResourceOnHdfs(String resource, String location) throws IOException { hdfsClient.delete(location); - try (InputStream inputStream = newInputStream(Paths.get("/docker/presto-product-tests", resource))) { + try (InputStream inputStream = newInputStream(Paths.get("/docker/trino-product-tests", resource))) { hdfsClient.saveFile(location, inputStream); } } diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java index fdb089e22766..9c45c0081a80 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaAvroReadsSmokeTest.java @@ -72,15 +72,15 @@ public class TestKafkaAvroReadsSmokeTest private static final String KAFKA_SCHEMA = "product_tests"; private static final String ALL_DATATYPES_AVRO_TOPIC_NAME = "read_all_datatypes_avro"; - private static final String ALL_DATATYPE_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/all_datatypes_avro_schema.avsc"; + private static final String ALL_DATATYPE_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/all_datatypes_avro_schema.avsc"; private static final String ALL_NULL_AVRO_TOPIC_NAME = "read_all_null_avro"; private static final String STRUCTURAL_AVRO_TOPIC_NAME = "read_structural_datatype_avro"; - private static final String STRUCTURAL_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/structural_datatype_avro_schema.avsc"; + private static final String STRUCTURAL_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/structural_datatype_avro_schema.avsc"; private static final String AVRO_SCHEMA_WITH_REFERENCES_TOPIC_NAME = "schema_with_references_avro"; - private static final String AVRO_SCHEMA_WITH_REFERENCES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/schema_with_references.avsc"; + private static final String AVRO_SCHEMA_WITH_REFERENCES_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/schema_with_references.avsc"; @Test(groups = {KAFKA, PROFILE_SPECIFIC_TESTS}, dataProvider = "catalogs") public void testSelectPrimitiveDataType(KafkaCatalog kafkaCatalog) diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java index ccb114198abd..35b63ed75dfd 100644 --- a/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java +++ b/testing/trino-product-tests/src/main/java/io/trino/tests/product/kafka/TestKafkaProtobufReadsSmokeTest.java @@ -63,13 +63,13 @@ public class TestKafkaProtobufReadsSmokeTest private static final String KAFKA_SCHEMA = "product_tests"; private static final String BASIC_DATATYPES_PROTOBUF_TOPIC_NAME = "read_basic_datatypes_protobuf"; - private static final String BASIC_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_datatypes.proto"; + private static final String BASIC_DATATYPES_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/basic_datatypes.proto"; private static final String BASIC_STRUCTURAL_PROTOBUF_TOPIC_NAME = "read_basic_structural_datatypes_protobuf"; - private static final String BASIC_STRUCTURAL_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/basic_structural_datatypes.proto"; + private static final String BASIC_STRUCTURAL_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/basic_structural_datatypes.proto"; private static final String ALL_DATATYPES_PROTOBUF_TOPIC_SCHEMA_REGISTRY = "all_datatypes_protobuf_schema_registry"; - private static final String ALL_DATATYPES_SCHEMA_PATH = "/docker/presto-product-tests/conf/presto/etc/catalog/kafka/all_datatypes.proto"; + private static final String ALL_DATATYPES_SCHEMA_PATH = "/docker/trino-product-tests/conf/trino/etc/catalog/kafka/all_datatypes.proto"; private static final KafkaCatalog KAFKA_CATALOG = new KafkaCatalog("kafka", "", true, new ProtobufMessageSerializer()); private static final KafkaCatalog KAFKA_SCHEMA_REGISTRY_CATALOG = new KafkaCatalog("kafka_schema_registry", "_schema_registry", false, new SchemaRegistryProtobufMessageSerializer());