diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5ebb4740770..daa70e1ece70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -551,7 +551,6 @@ jobs: - { modules: plugin/trino-delta-lake } - { modules: plugin/trino-delta-lake, profile: cloud-tests } - { modules: plugin/trino-delta-lake, profile: fte-tests } - - { modules: plugin/trino-delta-lake, profile: gcs-tests } - { modules: plugin/trino-druid } - { modules: plugin/trino-elasticsearch } - { modules: plugin/trino-hive } @@ -567,14 +566,11 @@ jobs: - { modules: plugin/trino-kudu } - { modules: plugin/trino-mariadb } - { modules: plugin/trino-mongodb } - - { modules: plugin/trino-mongodb, profile: fte-tests } - { modules: plugin/trino-mysql } - - { modules: plugin/trino-mysql, profile: fte-tests } - { modules: plugin/trino-oracle } - { modules: plugin/trino-phoenix5 } - { modules: plugin/trino-pinot } - { modules: plugin/trino-postgresql } - - { modules: plugin/trino-postgresql, profile: fte-tests } - { modules: plugin/trino-raptor-legacy } - { modules: plugin/trino-redis } - { modules: plugin/trino-redshift } @@ -582,7 +578,6 @@ jobs: - { modules: plugin/trino-redshift, profile: fte-tests } - { modules: plugin/trino-singlestore } - { modules: plugin/trino-sqlserver } - - { modules: plugin/trino-sqlserver, profile: fte-tests } - { modules: testing/trino-faulttolerant-tests, profile: default } - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-delta } - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-hive } @@ -630,7 +625,6 @@ jobs: if: >- matrix.modules != 'plugin/trino-singlestore' && ! (contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'cloud-tests')) - && ! (contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'gcs-tests')) && ! (contains(matrix.modules, 'trino-iceberg') && contains(matrix.profile, 'cloud-tests')) && ! (contains(matrix.modules, 'trino-bigquery') && contains(matrix.profile, 'cloud-tests-arrow')) && ! (contains(matrix.modules, 'trino-redshift') && contains(matrix.profile, 'cloud-tests')) @@ -646,24 +640,16 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESSKEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRETKEY }} AWS_REGION: us-east-2 + GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }} # Run tests if any of the secrets is present. Do not skip tests when one secret renamed, or secret name has a typo. if: >- contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'cloud-tests') && - (env.ABFS_ACCOUNT != '' || env.ABFS_CONTAINER != '' || env.ABFS_ACCESSKEY != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '') + (env.ABFS_ACCOUNT != '' || env.ABFS_CONTAINER != '' || env.ABFS_ACCESSKEY != '' || env.AWS_ACCESS_KEY_ID != '' || env.AWS_SECRET_ACCESS_KEY != '' || env.GCP_CREDENTIALS_KEY != '') run: | $MAVEN test ${MAVEN_TEST} ${{ format('-P {0}', matrix.profile) }} -pl :trino-delta-lake \ -Dhive.hadoop2.azure-abfs-container="${ABFS_CONTAINER}" \ -Dhive.hadoop2.azure-abfs-account="${ABFS_ACCOUNT}" \ - -Dhive.hadoop2.azure-abfs-access-key="${ABFS_ACCESSKEY}" - - name: GCS Delta Lake Tests - # Cloud tests are separate because they are time intensive, requiring cross-cloud network communication - env: - GCP_CREDENTIALS_KEY: ${{ secrets.GCP_CREDENTIALS_KEY }} - # Run tests if any of the secrets is present. Do not skip tests when one secret renamed, or secret name has a typo. - if: >- - contains(matrix.modules, 'trino-delta-lake') && contains(matrix.profile, 'gcs-tests') && env.GCP_CREDENTIALS_KEY != '' - run: | - $MAVEN test ${MAVEN_TEST} -P gcs-tests -pl :trino-delta-lake \ + -Dhive.hadoop2.azure-abfs-access-key="${ABFS_ACCESSKEY}" \ -Dtesting.gcp-storage-bucket="trino-ci-test" \ -Dtesting.gcp-credentials-key="${GCP_CREDENTIALS_KEY}" - name: Memsql Tests diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml index 3203ba076f95..b5d3d7946c86 100644 --- a/plugin/trino-delta-lake/pom.xml +++ b/plugin/trino-delta-lake/pom.xml @@ -521,6 +521,7 @@ **/TestDeltaLakeRegisterTableProcedureWithGlue.java **/TestDeltaLakeViewsGlueMetastore.java **/TestDeltaLakeConcurrentModificationGlueMetastore.java + **/TestDeltaLakeGcsConnectorSmokeTest.java @@ -544,22 +545,5 @@ - - - gcs-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/TestDeltaLakeGcsConnectorSmokeTest.java - - - - - - diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml index 4d2ae4c9a226..8308014c28f1 100644 --- a/plugin/trino-mongodb/pom.xml +++ b/plugin/trino-mongodb/pom.xml @@ -273,43 +273,4 @@ - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - - - fte-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index a506342eed6e..baf3394dd1fb 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -222,43 +222,4 @@ test - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - - - fte-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - diff --git a/plugin/trino-postgresql/pom.xml b/plugin/trino-postgresql/pom.xml index 0d6a0be91746..0f10f244e492 100644 --- a/plugin/trino-postgresql/pom.xml +++ b/plugin/trino-postgresql/pom.xml @@ -247,43 +247,4 @@ test - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - - - fte-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml index cb266fc4b309..3ce4a257d958 100644 --- a/plugin/trino-sqlserver/pom.xml +++ b/plugin/trino-sqlserver/pom.xml @@ -237,43 +237,4 @@ test - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - - - - fte-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*FailureRecoveryTest.java - - - - - - -