Skip to content

[4.0][INFRA] Update integration tests to clear all possible ivy caches + minor update to S3LogStoreUtilIntegrationTest #4767

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
merged 1 commit into from
Jun 14, 2025
Merged

[4.0][INFRA] Update integration tests to clear all possible ivy caches + minor update to S3LogStoreUtilIntegrationTest #4767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions connectors/examples/run_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ def run_sbt_proj(test_dir, proj, className, version, maven_repo, scala_version):

def clear_artifact_cache():
print("Clearing Delta artifacts from ivy2 and mvn cache")
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta"))
delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta"))
ivy_caches_to_clear = [filepath for filepath in os.listdir(os.path.expanduser("~")) if filepath.startswith(".ivy")]
print(f"Clearing Ivy caches in: {ivy_caches_to_clear}")
for filepath in ivy_caches_to_clear:
delete_if_exists(os.path.expanduser(f"~/{filepath}/cache/io.delta"))
delete_if_exists(os.path.expanduser(f"~/{filepath}/local/io.delta"))
delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/"))

def run_cmd(cmd, throw_on_error=True, env=None, stream_output=False, **kwargs):
Expand Down
10 changes: 6 additions & 4 deletions kernel/examples/run-kernel-examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ def run_example(version, maven_repo, project_dir, main_class, test_cases):

def clear_artifact_cache():
print("Clearing Delta Kernel artifacts from ivy2 and mvn cache")
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta.kernel"))
delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta.kernel"))
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta"))
delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta"))
ivy_caches_to_clear = [filepath for filepath in os.listdir(os.path.expanduser("~")) if filepath.startswith(".ivy")]
print(f"Clearing Ivy caches in: {ivy_caches_to_clear}")
for filepath in ivy_caches_to_clear:
for subpath in ["io.delta", "io.delta.kernel"]:
delete_if_exists(os.path.expanduser(f"~/{filepath}/cache/{subpath}"))
delete_if_exists(os.path.expanduser(f"~/{filepath}/local/{subpath}"))
delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/"))


Expand Down
8 changes: 7 additions & 1 deletion python/run-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,13 @@ def prepare(root_dir, use_spark_master):
print("##### Preparing python tests & building packages #####")
# Build package with python files in it
sbt_path = path.join(root_dir, path.join("build", "sbt"))
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta"))
ivy_caches_to_clear = [
filepath for filepath in os.listdir(os.path.expanduser("~"))
if filepath.startswith(".ivy")
]
print(f"Clearing Ivy caches in: {ivy_caches_to_clear}")
for filepath in ivy_caches_to_clear:
delete_if_exists(os.path.expanduser(f"~/{filepath}/cache/io.delta"))
delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/"))
sbt_command = [sbt_path]
packages = ["spark/publishM2", "storage/publishM2"]
Expand Down
9 changes: 7 additions & 2 deletions run-integration-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ def test_missing_delta_storage_jar(root_dir, version, use_local):
delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/delta-storage"))
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta/delta-storage"))
delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta/delta-storage"))
delete_if_exists(os.path.expanduser("~/.ivy2.5.2/local/io.delta/delta-storage"))
delete_if_exists(os.path.expanduser("~/.ivy2.5.2/cache/io.delta/delta-storage"))

python_root_dir = path.join(root_dir, "python")
extra_class_path = path.join(python_root_dir, path.join("delta", "testing"))
Expand Down Expand Up @@ -400,8 +402,11 @@ def run_unity_catalog_commit_coordinator_integration_tests(root_dir, version, te

def clear_artifact_cache():
print("Clearing Delta artifacts from ivy2 and mvn cache")
delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta"))
delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta"))
ivy_caches_to_clear = [filepath for filepath in os.listdir(os.path.expanduser("~")) if filepath.startswith(".ivy")]
print(f"Clearing Ivy caches in: {ivy_caches_to_clear}")
for filepath in ivy_caches_to_clear:
delete_if_exists(os.path.expanduser(f"~/{filepath}/cache/io.delta"))
delete_if_exists(os.path.expanduser(f"~/{filepath}/local/io.delta"))
delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/"))


Expand Down
4 changes: 0 additions & 4 deletions storage/src/test/scala/io/delta/storage/integration/S3LogStoreUtilIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ class S3LogStoreUtilIntegrationTest extends AnyFunSuite {
}
private val maxKeys = 2
private val configuration = new Configuration()
configuration.set( // for local testing only
"fs.s3a.aws.credentials.provider",
"com.amazonaws.auth.profile.ProfileCredentialsProvider",
)
configuration.set("fs.s3a.paging.maximum", maxKeys.toString)

private def touch(key: String) {
Expand Down
Loading