diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/EnvironmentTest.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/EnvironmentTest.java index 9b3c303ce4..bf1988167b 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/EnvironmentTest.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/EnvironmentTest.java @@ -150,8 +150,6 @@ public void testCreateEmailSettingSuccessful() { .password(emailPassword) .ok(); - emailSettingForm.buttonOk.click(); - Awaitility.await() .untilAsserted( () -> assertThat(environmentPage.settingList) diff --git a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.16-on-yarn/Dockerfile b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.16-on-yarn/Dockerfile index 770255d968..66b927c068 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.16-on-yarn/Dockerfile +++ b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.16-on-yarn/Dockerfile @@ -17,6 +17,7 @@ FROM apache/streampark:ci as base-image FROM flink:1.16.3-scala_2.12-java8 as flink-image +FROM eclipse-temurin:8-jdk-jammy as jdk8-image # Install streampark FROM sbloodys/hadoop:3.3.6 @@ -28,18 +29,7 @@ RUN sudo chown -R hadoop.hadoop /streampark \ COPY --from=flink-image /opt/flink /flink-1.16.3 RUN sudo chown -R hadoop.hadoop /flink-1.16.3 -# Install javac -ARG TARGETPLATFORM -RUN echo "TARGETPLATFORM: $TARGETPLATFORM" -RUN \ - if [ "$TARGETPLATFORM" = "linux/arm64" ];then \ - sudo rm -f /etc/yum.repos.d/*.repo; \ - sudo wget http://mirrors.aliyun.com/repo/Centos-altarch-7.repo -O /etc/yum.repos.d/CentOS-Base.repo; \ - sudo sed -i "s/http:\/\//https:\/\//g" /etc/yum.repos.d/CentOS-Base.repo; \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - elif [ "$TARGETPLATFORM" = "linux/amd64" ];then \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - else \ - echo "unknown TARGETPLATFORM: $TARGETPLATFORM"; \ - exit 2; \ - fi +# Bundled JDK 8 from Eclipse Temurin (avoid CentOS 7 yum mirror retirement) +COPY --from=jdk8-image /opt/java/openjdk /usr/lib/jvm/jdk8 +ENV JAVA_HOME=/usr/lib/jvm/jdk8 +ENV PATH="${JAVA_HOME}/bin:${PATH}" diff --git a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.17-on-yarn/Dockerfile b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.17-on-yarn/Dockerfile index 141e87ae0a..488853ba3e 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.17-on-yarn/Dockerfile +++ b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.17-on-yarn/Dockerfile @@ -17,6 +17,7 @@ FROM apache/streampark:ci as base-image FROM flink:1.17.2-scala_2.12-java8 as flink-image +FROM eclipse-temurin:8-jdk-jammy as jdk8-image # Install streampark FROM sbloodys/hadoop:3.3.6 @@ -28,18 +29,7 @@ RUN sudo chown -R hadoop.hadoop /streampark \ COPY --from=flink-image /opt/flink /flink-1.17.2 RUN sudo chown -R hadoop.hadoop /flink-1.17.2 -# Install javac -ARG TARGETPLATFORM -RUN echo "TARGETPLATFORM: $TARGETPLATFORM" -RUN \ - if [ "$TARGETPLATFORM" = "linux/arm64" ];then \ - sudo rm -f /etc/yum.repos.d/*.repo; \ - sudo wget http://mirrors.aliyun.com/repo/Centos-altarch-7.repo -O /etc/yum.repos.d/CentOS-Base.repo; \ - sudo sed -i "s/http:\/\//https:\/\//g" /etc/yum.repos.d/CentOS-Base.repo; \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - elif [ "$TARGETPLATFORM" = "linux/amd64" ];then \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - else \ - echo "unknown TARGETPLATFORM: $TARGETPLATFORM"; \ - exit 2; \ - fi +# Bundled JDK 8 from Eclipse Temurin (avoid CentOS 7 yum mirror retirement) +COPY --from=jdk8-image /opt/java/openjdk /usr/lib/jvm/jdk8 +ENV JAVA_HOME=/usr/lib/jvm/jdk8 +ENV PATH="${JAVA_HOME}/bin:${PATH}" diff --git a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.18-on-yarn/Dockerfile b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.18-on-yarn/Dockerfile index d1b5cde8df..588be1011c 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.18-on-yarn/Dockerfile +++ b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.18-on-yarn/Dockerfile @@ -17,6 +17,7 @@ FROM apache/streampark:ci as base-image FROM flink:1.18.1-scala_2.12-java8 as flink-image +FROM eclipse-temurin:8-jdk-jammy as jdk8-image # Install streampark FROM sbloodys/hadoop:3.3.6 @@ -28,18 +29,7 @@ RUN sudo chown -R hadoop.hadoop /streampark \ COPY --from=flink-image /opt/flink /flink-1.18.1 RUN sudo chown -R hadoop.hadoop /flink-1.18.1 -# Install javac -ARG TARGETPLATFORM -RUN echo "TARGETPLATFORM: $TARGETPLATFORM" -RUN \ - if [ "$TARGETPLATFORM" = "linux/arm64" ];then \ - sudo rm -f /etc/yum.repos.d/*.repo; \ - sudo wget http://mirrors.aliyun.com/repo/Centos-altarch-7.repo -O /etc/yum.repos.d/CentOS-Base.repo; \ - sudo sed -i "s/http:\/\//https:\/\//g" /etc/yum.repos.d/CentOS-Base.repo; \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - elif [ "$TARGETPLATFORM" = "linux/amd64" ];then \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - else \ - echo "unknown TARGETPLATFORM: $TARGETPLATFORM"; \ - exit 2; \ - fi +# Bundled JDK 8 from Eclipse Temurin (avoid CentOS 7 yum mirror retirement) +COPY --from=jdk8-image /opt/java/openjdk /usr/lib/jvm/jdk8 +ENV JAVA_HOME=/usr/lib/jvm/jdk8 +ENV PATH="${JAVA_HOME}/bin:${PATH}" diff --git a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.20-on-yarn/Dockerfile b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.20-on-yarn/Dockerfile index 6b050d2203..0b886cf8b1 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.20-on-yarn/Dockerfile +++ b/streampark-e2e/streampark-e2e-case/src/test/resources/docker/flink-1.20-on-yarn/Dockerfile @@ -17,6 +17,7 @@ FROM apache/streampark:ci as base-image FROM flink:1.20.1-scala_2.12-java8 as flink-image +FROM eclipse-temurin:8-jdk-jammy as jdk8-image # Install streampark FROM sbloodys/hadoop:3.3.6 @@ -28,18 +29,7 @@ RUN sudo chown -R hadoop.hadoop /streampark \ COPY --from=flink-image /opt/flink /flink-1.20.1 RUN sudo chown -R hadoop.hadoop /flink-1.20.1 -# Install javac -ARG TARGETPLATFORM -RUN echo "TARGETPLATFORM: $TARGETPLATFORM" -RUN \ - if [ "$TARGETPLATFORM" = "linux/arm64" ];then \ - sudo rm -f /etc/yum.repos.d/*.repo; \ - sudo wget http://mirrors.aliyun.com/repo/Centos-altarch-7.repo -O /etc/yum.repos.d/CentOS-Base.repo; \ - sudo sed -i "s/http:\/\//https:\/\//g" /etc/yum.repos.d/CentOS-Base.repo; \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - elif [ "$TARGETPLATFORM" = "linux/amd64" ];then \ - sudo yum install -y java-1.8.0-openjdk-devel; \ - else \ - echo "unknown TARGETPLATFORM: $TARGETPLATFORM"; \ - exit 2; \ - fi +# Bundled JDK 8 from Eclipse Temurin (avoid CentOS 7 yum mirror retirement) +COPY --from=jdk8-image /opt/java/openjdk /usr/lib/jvm/jdk8 +ENV JAVA_HOME=/usr/lib/jvm/jdk8 +ENV PATH="${JAVA_HOME}/bin:${PATH}"