Skip to content

Commit 2b8b170

Browse files
committed
Reenable Polaris and Unity catalogs
1 parent 03c2bf4 commit 2b8b170

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/ci.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ jobs:
1818
- image: almalinux9-oj17-openldap-active-directory
1919
platforms: linux/amd64,linux/arm64
2020
test: openldap-active-directory
21-
# TODO https://github.com/trinodb/trino/issues/24945 Reenable Polaris tests in Iceberg
22-
# - image: polaris-catalog
23-
# test: polaris-catalog
21+
- image: polaris-catalog
22+
test: polaris-catalog
2423
- image: spark3-iceberg
2524
platforms: linux/amd64,linux/arm64
2625
test: spark3-iceberg
@@ -45,9 +44,8 @@ jobs:
4544
# TODO add test https://github.com/trinodb/trino/issues/14543
4645
- image: phoenix5
4746
platforms: linux/amd64,linux/arm64
48-
# TODO https://github.com/trinodb/trino/issues/24945 Reenable Unity tests in Iceberg
49-
# - image: unity-catalog
50-
# test: unity-catalog
47+
- image: unity-catalog
48+
test: unity-catalog
5149
steps:
5250
- uses: actions/checkout@v3
5351
with:

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ jobs:
7373
fi
7474
skipped_images=(
7575
testing/almalinux9-oj17-openldap-base
76-
testing/polaris-catalog
77-
testing/unity-catalog
7876
)
7977
single_arch=(
8078
testing/hdp3.1-hive
@@ -95,6 +93,8 @@ jobs:
9593
testing/spark3-iceberg
9694
testing/spark3-hudi
9795
testing/hive4.0-hive
96+
testing/polaris-catalog
97+
testing/unity-catalog
9898
)
9999
referenced_images=("${skipped_images[@]}" "${single_arch[@]}" "${multi_arch[@]}")
100100
make meta

testing/polaris-catalog/Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ RUN git clone --depth=1 https://github.com/apache/polaris.git /polaris
1616

1717
WORKDIR /polaris
1818

19-
RUN gradle --no-daemon --info shadowJar
19+
RUN gradle :polaris-quarkus-server:build
2020

2121
FROM eclipse-temurin:21-jre-alpine
2222

23-
COPY --from=builder /polaris/dropwizard/service/build/libs/polaris-dropwizard-service-1.0.0-incubating-SNAPSHOT.jar /polaris-service.jar
24-
COPY --from=builder /polaris/polaris-server.yml /polaris-server.yml
23+
ARG POLARIS_VERSION=1.0.0-incubating-SNAPSHOT
24+
25+
COPY --from=builder /polaris/quarkus/server/build/distributions/polaris-quarkus-server-1.0.0-incubating-SNAPSHOT.zip /polaris-quarkus-server-${POLARIS_VERSION}.zip
26+
RUN unzip polaris-quarkus-server-${POLARIS_VERSION}.zip
2527

2628
EXPOSE 8181
2729

28-
CMD ["java", "-jar", "polaris-service.jar", "server", "polaris-server.yml"]
30+
CMD ["java", "-jar", "polaris-quarkus-server-${POLARIS_VERSION}/quarkus-run.jar"]

0 commit comments

Comments
 (0)