Skip to content

exclude m2m tests in pr checks #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shivam2680 merged 3 commits into from
Jul 2, 2025
Merged

exclude m2m tests in pr checks #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a42ce5a
exclude m2m tests in pr checks
shivam2680 Jul 2, 2025
21df6e2
exclude m2m tests on PR run
shivam2680 Jul 2, 2025
0a60465
removed getJwtTokenEndpoint method
shivam2680 Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/prIntegrationTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
include:
- test-command: mvn -B compile test -Dtest=*IntegrationTests
- test-command: mvn -B compile test -Dtest=*IntegrationTests,!M2MPrivateKeyCredentialsIntegrationTests,!M2MAuthIntegrationTests

@gopalldb gopalldb Jul 2, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a tracking ticket to track how to run this?

fake-service-type: 'SQL_EXEC'
- test-command: mvn -B compile test -Dtest=*IntegrationTests,!M2MPrivateKeyCredentialsIntegrationTests,!SqlExecApiHybridResultsIntegrationTests,!DBFSVolumeIntegrationTests,!M2MAuthIntegrationTests,!UCVolumeIntegrationTests
fake-service-type: 'THRIFT_SERVER'
Expand Down
4 changes: 2 additions & 2 deletions ...java/com/databricks/jdbc/integration/fakeservice/AbstractFakeServiceIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.databricks.jdbc.integration.fakeservice;

import static com.databricks.jdbc.integration.IntegrationTestUtil.getJWTTokenEndpointHost;
import static com.databricks.jdbc.integration.fakeservice.FakeServiceConfigLoader.CLOUD_FETCH_HOST_PROP;
import static com.databricks.jdbc.integration.fakeservice.FakeServiceConfigLoader.DATABRICKS_HOST_PROP;
import static com.databricks.jdbc.integration.fakeservice.FakeServiceConfigLoader.JWT_TOKEN_ENDPOINT_HOST_PROP;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;

import com.databricks.jdbc.common.DatabricksJdbcConstants;
Expand Down Expand Up @@ -73,7 +73,7 @@ public abstract class AbstractFakeServiceIntegrationTests {
new FakeServiceHttpClientFactory(
FakeServiceConfigLoader.getFakeServiceUserAgent()))),
DatabricksJdbcConstants.FakeServiceType.JWT_TOKEN_ENDPOINT,
getJWTTokenEndpointHost());
FakeServiceConfigLoader.getProperty(JWT_TOKEN_ENDPOINT_HOST_PROP));

/**
* Resets the potential mutations (e.g., URLs set by {@link #setDatabricksApiTargetUrl}, {@link
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/databricks/jdbc/integration/fakeservice/FakeServiceConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public class FakeServiceConfigLoader {

public static final String PRESIGNED_URL_HOST = "host.presignedurl";

public static final String JWT_TOKEN_ENDPOINT_HOST_PROP = "host.jwt.token.endpoint";

public static final String TEST_CATALOG = "testcatalog";

public static final String TEST_SCHEMA = "testschema";
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/sqlexecfakeservicetest.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
host.databricks=https://e2-dogfood.staging.cloud.databricks.com:443
host.cloudfetch=https://e2-dogfood-core.s3.us-west-2.amazonaws.com
host.presignedurl=https://us-west-2-extstaging-managed-catalog-test-bucket-1.s3-fips.us-west-2.amazonaws.com
host.jwt.token.endpoint=https://dev-591123.oktapreview.com
# SQL warehouse compute
httppath=/sql/1.0/warehouses/dd43ee29fedd958d
connschema=default
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/sqlgatewayfakeservicetest.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
host.databricks=https://e2-dogfood.staging.cloud.databricks.com:443
host.cloudfetch=https://e2-dogfood-core.s3.us-west-2.amazonaws.com
host.jwt.token.endpoint=https://dev-591123.oktapreview.com
# SQL warehouse compute
httppath=/sql/1.0/warehouses/dd43ee29fedd958d
connschema=default
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/thriftserverfakeservicetest.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
host.databricks=https://e2-dogfood.staging.cloud.databricks.com:443
host.cloudfetch=https://e2-dogfood-core.s3.us-west-2.amazonaws.com
host.jwt.token.endpoint=https://dev-591123.oktapreview.com
# All-purpose compute
httppath=/sql/protocolv1/o/6051921418418893/0819-204509-hill72
connschema=default
Expand Down
Loading