diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 2071d65b44db0..ab44621d3dddb 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -28,3 +28,8 @@ jobs: call-build-and-test: name: Run uses: ./.github/workflows/build_and_test.yml + with: + jobs: >- + { + "k8s-integration-tests": "true" + } diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 21ab6f9f636a0..cc5a5e4cff661 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -646,7 +646,7 @@ object KubernetesIntegrationTests { val bindingsDir = s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings" val javaImageTag = sys.props.get("spark.kubernetes.test.javaImageTag") val dockerFile = sys.props.getOrElse("spark.kubernetes.test.dockerFile", - s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile.java17") + s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile") val pyDockerFile = sys.props.getOrElse("spark.kubernetes.test.pyDockerFile", s"$bindingsDir/python/Dockerfile") val rDockerFile = sys.props.getOrElse("spark.kubernetes.test.rDockerFile", diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile index 9f4e2462f3c00..fc529afb1be82 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ARG java_image_tag=11-jre-slim +ARG java_image_tag=11-jre-focal -FROM openjdk:${java_image_tag} +FROM eclipse-temurin:${java_image_tag} ARG spark_uid=185 @@ -28,7 +28,6 @@ ARG spark_uid=185 # docker build -t spark:latest -f kubernetes/dockerfiles/spark/Dockerfile . RUN set -ex && \ - sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \ apt-get update && \ ln -s /lib /lib64 && \ apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools && \