Skip to content

Commit e3c213b

Browse files
committed
[KYUUBI #7194] Speed up K8s integration tests in CI
### Why are the changes needed? Use `apache/spark:3.5.5` as the Kyuubi image's base image to avoid downloading Spark tgz inside the image building phase. ### How was this patch tested? Monitor CI. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #7194 from pan3793/k8s-it. Closes #7194 78482a8 [Cheng Pan] Update .github/workflows/master.yml 32e2ca7 [Cheng Pan] Speed up K8s integration tests in CI Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent ea75fa8 commit e3c213b

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/master.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,17 +422,21 @@ jobs:
422422
uses: docker/setup-buildx-action@v3
423423
with:
424424
cache-binary: false
425+
- name: Pull Spark image
426+
run: |
427+
docker pull apache/spark:3.5.5
425428
- name: Build Kyuubi Docker Image
426429
uses: docker/build-push-action@v6
427430
with:
428431
# passthrough CI into build container
429432
build-args: |
430433
CI=${CI}
431-
MVN_ARG=--flink-provided --hive-provided
434+
BASE_IMAGE=apache/spark:3.5.5
435+
MVN_ARG=--spark-provided --flink-provided --hive-provided
432436
context: .
433437
file: build/Dockerfile.CI
434438
load: true
435-
tags: apache/kyuubi:latest
439+
tags: apache/kyuubi:ci
436440
- name: Cache Engine Archives
437441
uses: ./.github/actions/cache-engine-archives
438442
- name: Setup Minikube
@@ -442,9 +446,8 @@ jobs:
442446
sudo install minikube-linux-amd64 /usr/local/bin/minikube
443447
minikube start --cpus 2 --memory 4096 --kubernetes-version=${KUBERNETES_VERSION} --force
444448
# https://minikube.sigs.k8s.io/docs/handbook/pushing/#7-loading-directly-to-in-cluster-container-runtime
445-
minikube image load apache/kyuubi:latest
449+
minikube image load apache/kyuubi:ci
446450
# pre-install spark into minikube
447-
docker pull apache/spark:3.5.5
448451
minikube image load apache/spark:3.5.5
449452
- name: kubectl pre-check
450453
run: |

integration-tests/kyuubi-kubernetes-it/src/test/resources/driver.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
apiVersio: v1
18+
apiVersion: v1
1919
kind: Pod
2020
metadata:
2121
name: driver

integration-tests/kyuubi-kubernetes-it/src/test/resources/kyuubi-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: kyuubi
2626
containers:
2727
- name: kyuubi-server
28-
image: apache/kyuubi:latest
28+
image: apache/kyuubi:ci
2929
imagePullPolicy: IfNotPresent
3030
env:
3131
- name: KYUUBI_JAVA_OPTS

0 commit comments

Comments
 (0)