Skip to content

Commit c057ea1

Browse files
committed
Download ivy2 packages in test worker image
1 parent b530201 commit c057ea1

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

docker/Dockerfile.worker

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ RUN --mount=type=bind,source=./syncmaster/worker/ivy2.py,target=/app/syncmaster/
5757
python /app/docker/download_ivy2_packages.py postgres && \
5858
python /app/docker/download_ivy2_packages.py oracle && \
5959
python /app/docker/download_ivy2_packages.py mssql && \
60-
python /app/docker/download_ivy2_packages.py mysql && \
61-
mkdir -p /home/syncmaster/.ivy2/ && \
62-
cp --recursive /root/.ivy2/* /home/syncmaster/.ivy2/
60+
python /app/docker/download_ivy2_packages.py mysql
6361
# if someone uses custom worker image, they should download jars on their own
6462

6563

@@ -73,7 +71,7 @@ RUN useradd syncmaster && \
7371

7472
COPY --from=builder /app/.venv/ /app/.venv/
7573
# custom Spark session function may download different jars, so syncmaster have to own them
76-
COPY --from=ivy2_packages --chown=syncmaster:syncmaster /home/syncmaster/.ivy2/ /home/syncmaster/.ivy2/
74+
COPY --from=ivy2_packages --chown=syncmaster:syncmaster /root/.ivy2/ /home/syncmaster/.ivy2/
7775
# If someone needs to use worker image with root user, use the same jars
7876
RUN mkdir -p /root && \
7977
ln -s /home/syncmaster/.ivy2 /root/.ivy2
@@ -83,7 +81,7 @@ RUN python -m compileall syncmaster
8381
USER syncmaster
8482

8583

86-
FROM builder AS test
84+
FROM ivy2_packages AS test
8785

8886
RUN --mount=type=cache,target=/root/.cache/uv \
8987
uv sync \

tests/test_integration/test_run_transfer/connection_fixtures/hdfs_fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def hdfs_file_connection(hdfs_server):
6767

6868

6969
@pytest.fixture
70-
def hdfs_file_connection_with_path(request, hdfs_file_connection):
70+
def hdfs_file_connection_with_path(hdfs_file_connection):
7171
connection = hdfs_file_connection
7272
source = PurePosixPath("/data")
7373
target = PurePosixPath("/target")

0 commit comments

Comments
 (0)