diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0f8a81c..3fa6f2b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ jobs: config: - image: accumulo - image: dns - - image: centos7-oj11 - - image: centos7-oj11-openldap-referrals + - image: centos7-oj17 + - image: centos7-oj17-openldap-referrals - image: spark3.0-iceberg - image: spark3-delta - image: kerberos diff --git a/testing/accumulo/Dockerfile b/testing/accumulo/Dockerfile index e2456095..9202ea0d 100644 --- a/testing/accumulo/Dockerfile +++ b/testing/accumulo/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled ARG ACCUMULO_VERSION=1.7.4 ARG HADOOP_VERSION=2.6.5 @@ -43,7 +43,7 @@ RUN yum update -y && \ alternatives --set javac /usr/lib/jvm/zulu-8/bin/javac && \ yum clean all -y -# Override JAVA_HOME inherited from testing/centos7-oj11 +# Override JAVA_HOME inherited from testing/centos7-oj17 ENV JAVA_HOME=/usr/lib/jvm/zulu-8 RUN mkdir -p $IMAGE_ROOT_INSTALL diff --git a/testing/cdh5.12-hive/Dockerfile b/testing/cdh5.12-hive/Dockerfile index c20facb3..57fb598e 100644 --- a/testing/cdh5.12-hive/Dockerfile +++ b/testing/cdh5.12-hive/Dockerfile @@ -21,13 +21,11 @@ RUN \ set -xeu && \ # Remove unaccessible CDH5 repos so yum is still usable rm /etc/yum.repos.d/cloudera-cdh5.repo && \ - # Install additional Zulu JDK 17.0.3 - rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \ - # Upgrade Zulu JDK to 11.0.15 - rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \ - # Set JDK 11 as a default one - alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \ - alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ + # Install Zulu JDK 17.0.4 + rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \ + # Set JDK 17 as a default one + alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \ + alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ echo "Done" # HDFS ports diff --git a/testing/cdh5.15-hive/Dockerfile b/testing/cdh5.15-hive/Dockerfile index 869884c1..d0150a76 100644 --- a/testing/cdh5.15-hive/Dockerfile +++ b/testing/cdh5.15-hive/Dockerfile @@ -21,13 +21,11 @@ RUN \ set -xeu && \ # Remove unaccessible CDH5 repos so yum is still usable rm /etc/yum.repos.d/cloudera-cdh5.repo && \ - # Install additional Zulu JDK 17.0.3 - rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \ - # Upgrade Zulu JDK to 11.0.15 - rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \ - # Set JDK 11 as default one - alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \ - alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ + # Install Zulu JDK 17.0.4 + rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \ + # Set JDK 17 as a default one + alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \ + alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ echo "Done" # HDFS ports diff --git a/testing/centos7-oj11-openldap-referrals/Dockerfile b/testing/centos7-oj17-openldap-referrals/Dockerfile similarity index 95% rename from testing/centos7-oj11-openldap-referrals/Dockerfile rename to testing/centos7-oj17-openldap-referrals/Dockerfile index 05aadf0b..7edfc2c0 100644 --- a/testing/centos7-oj11-openldap-referrals/Dockerfile +++ b/testing/centos7-oj17-openldap-referrals/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11-openldap:unlabelled +FROM testing/centos7-oj17-openldap:unlabelled # COPY CONFIGURATION COPY ./files / diff --git a/testing/centos7-oj11-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif b/testing/centos7-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif similarity index 100% rename from testing/centos7-oj11-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif rename to testing/centos7-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif diff --git a/testing/centos7-oj11-openldap/Dockerfile b/testing/centos7-oj17-openldap/Dockerfile similarity index 99% rename from testing/centos7-oj11-openldap/Dockerfile rename to testing/centos7-oj17-openldap/Dockerfile index 0fd73296..22fdf241 100644 --- a/testing/centos7-oj11-openldap/Dockerfile +++ b/testing/centos7-oj17-openldap/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled # INSTALL OPENLDAP RUN yum -y install openssl openldap openldap-clients openldap-servers \ diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/certs/active-directory-certificate.crt b/testing/centos7-oj17-openldap/files/etc/openldap/certs/active-directory-certificate.crt similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/certs/active-directory-certificate.crt rename to testing/centos7-oj17-openldap/files/etc/openldap/certs/active-directory-certificate.crt diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/certs/openldap-certificate.pem b/testing/centos7-oj17-openldap/files/etc/openldap/certs/openldap-certificate.pem similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/certs/openldap-certificate.pem rename to testing/centos7-oj17-openldap/files/etc/openldap/certs/openldap-certificate.pem diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/certs/private.pem b/testing/centos7-oj17-openldap/files/etc/openldap/certs/private.pem similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/certs/private.pem rename to testing/centos7-oj17-openldap/files/etc/openldap/certs/private.pem diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/certs/serial.txt b/testing/centos7-oj17-openldap/files/etc/openldap/certs/serial.txt similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/certs/serial.txt rename to testing/centos7-oj17-openldap/files/etc/openldap/certs/serial.txt diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/certs/trino-coordinator-for-ldap.pem b/testing/centos7-oj17-openldap/files/etc/openldap/certs/trino-coordinator-for-ldap.pem similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/certs/trino-coordinator-for-ldap.pem rename to testing/centos7-oj17-openldap/files/etc/openldap/certs/trino-coordinator-for-ldap.pem diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/setup/createOU.ldif b/testing/centos7-oj17-openldap/files/etc/openldap/setup/createOU.ldif similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/setup/createOU.ldif rename to testing/centos7-oj17-openldap/files/etc/openldap/setup/createOU.ldif diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/setup/ldap_disable_bind_anon.ldif b/testing/centos7-oj17-openldap/files/etc/openldap/setup/ldap_disable_bind_anon.ldif similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/setup/ldap_disable_bind_anon.ldif rename to testing/centos7-oj17-openldap/files/etc/openldap/setup/ldap_disable_bind_anon.ldif diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/setup/memberof.ldif b/testing/centos7-oj17-openldap/files/etc/openldap/setup/memberof.ldif similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/setup/memberof.ldif rename to testing/centos7-oj17-openldap/files/etc/openldap/setup/memberof.ldif diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/setup/modify_server.ldif b/testing/centos7-oj17-openldap/files/etc/openldap/setup/modify_server.ldif similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/setup/modify_server.ldif rename to testing/centos7-oj17-openldap/files/etc/openldap/setup/modify_server.ldif diff --git a/testing/centos7-oj11-openldap/files/etc/openldap/setup/refint.ldif b/testing/centos7-oj17-openldap/files/etc/openldap/setup/refint.ldif similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/openldap/setup/refint.ldif rename to testing/centos7-oj17-openldap/files/etc/openldap/setup/refint.ldif diff --git a/testing/centos7-oj11-openldap/files/etc/supervisord.conf b/testing/centos7-oj17-openldap/files/etc/supervisord.conf similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/supervisord.conf rename to testing/centos7-oj17-openldap/files/etc/supervisord.conf diff --git a/testing/centos7-oj11-openldap/files/etc/supervisord.d/slapd.conf b/testing/centos7-oj17-openldap/files/etc/supervisord.d/slapd.conf similarity index 100% rename from testing/centos7-oj11-openldap/files/etc/supervisord.d/slapd.conf rename to testing/centos7-oj17-openldap/files/etc/supervisord.d/slapd.conf diff --git a/testing/centos7-oj11-openldap/files/usr/bin/wait-for-slapd.sh b/testing/centos7-oj17-openldap/files/usr/bin/wait-for-slapd.sh similarity index 100% rename from testing/centos7-oj11-openldap/files/usr/bin/wait-for-slapd.sh rename to testing/centos7-oj17-openldap/files/usr/bin/wait-for-slapd.sh diff --git a/testing/centos7-oj11-openldap/generate-certificates.md b/testing/centos7-oj17-openldap/generate-certificates.md similarity index 100% rename from testing/centos7-oj11-openldap/generate-certificates.md rename to testing/centos7-oj17-openldap/generate-certificates.md diff --git a/testing/centos7-oj11/Dockerfile b/testing/centos7-oj17/Dockerfile similarity index 76% rename from testing/centos7-oj11/Dockerfile rename to testing/centos7-oj17/Dockerfile index 63ca1d90..662dc48c 100644 --- a/testing/centos7-oj11/Dockerfile +++ b/testing/centos7-oj17/Dockerfile @@ -22,13 +22,11 @@ RUN \ wget \ && \ \ - # install Zulu JDK - rpm -i https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \ - # Install additional Zulu JDK 17.0.3 - rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \ - # Set JDK 11 as a default one - alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \ - alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ + # Install Zulu JDK 17.0.4 \ + rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \ + # Set JDK 17 as a default one + alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \ + alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ \ # install supervisor yum --enablerepo=extras install -y setuptools epel-release && \ @@ -48,5 +46,5 @@ RUN \ yum -y clean all && rm -rf /tmp/* /var/tmp/* ENV PATH="/usr/local/bin:${PATH}" -ENV JAVA_HOME=/usr/lib/jvm/zulu-11 +ENV JAVA_HOME=/usr/lib/jvm/zulu-17 ENV LANG=en_US.UTF-8 diff --git a/testing/centos7-oj11/files/opt/trinodev/site-override.xslt b/testing/centos7-oj17/files/opt/trinodev/site-override.xslt similarity index 100% rename from testing/centos7-oj11/files/opt/trinodev/site-override.xslt rename to testing/centos7-oj17/files/opt/trinodev/site-override.xslt diff --git a/testing/centos7-oj11/files/usr/local/bin/apply-all-site-xml-overrides b/testing/centos7-oj17/files/usr/local/bin/apply-all-site-xml-overrides similarity index 100% rename from testing/centos7-oj11/files/usr/local/bin/apply-all-site-xml-overrides rename to testing/centos7-oj17/files/usr/local/bin/apply-all-site-xml-overrides diff --git a/testing/centos7-oj11/files/usr/local/bin/apply-site-xml-override b/testing/centos7-oj17/files/usr/local/bin/apply-site-xml-override similarity index 100% rename from testing/centos7-oj11/files/usr/local/bin/apply-site-xml-override rename to testing/centos7-oj17/files/usr/local/bin/apply-site-xml-override diff --git a/testing/hdp2.6-hive/Dockerfile b/testing/hdp2.6-hive/Dockerfile index 452a0418..e63f0013 100644 --- a/testing/hdp2.6-hive/Dockerfile +++ b/testing/hdp2.6-hive/Dockerfile @@ -21,13 +21,11 @@ RUN \ set -xeu && \ # Remove unaccessible HDP2 repos so yum is still usable rm /etc/yum.repos.d/hdp*.repo && \ - # Install additional Zulu JDK 17.0.3 - rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \ - # Upgrade Zulu JDK to 11.0.15 - rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \ - # Set JDK 11 as a default one - alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \ - alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ + # Install Zulu JDK 17.0.4 + rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \ + # Set JDK 17 as a default one + alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \ + alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ echo "Done" # HDFS ports diff --git a/testing/hdp3.1-hive/Dockerfile b/testing/hdp3.1-hive/Dockerfile index 8e716b61..3d13bbc4 100644 --- a/testing/hdp3.1-hive/Dockerfile +++ b/testing/hdp3.1-hive/Dockerfile @@ -21,13 +21,11 @@ RUN \ set -xeu && \ # Remove unaccessible HDP3 repos so yum is still usable rm /etc/yum.repos.d/hdp*.repo && \ - # Install additional Zulu JDK 17.0.3 - rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \ - # Upgrade Zulu JDK to 11.0.15 - rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \ - # Set JDK 11 as default one - alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \ - alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ + # Install Zulu JDK 17.0.4 + rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \ + # Set JDK 17 as a default one + alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \ + alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ echo "Done" # HDFS ports diff --git a/testing/hive3.1-hive/Dockerfile b/testing/hive3.1-hive/Dockerfile index e0da45af..eab3552c 100644 --- a/testing/hive3.1-hive/Dockerfile +++ b/testing/hive3.1-hive/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled ARG JAVA8_ZULU_VERSION=8.56.0.21-ca-jdk8.0.302 @@ -31,7 +31,7 @@ RUN yum install -y \ alternatives --set javac /usr/lib/jvm/zulu-8/bin/javac \ && yum -q clean all && rm -rf /var/cache/yum -# Override JAVA_HOME inherited from testing/centos7-oj11 +# Override JAVA_HOME inherited from testing/centos7-oj17 ENV JAVA_HOME=/usr/lib/jvm/zulu-8 ARG HADOOP_VERSION=3.1.2 diff --git a/testing/kerberos/Dockerfile b/testing/kerberos/Dockerfile index 3b8d52fa..5f740ce9 100644 --- a/testing/kerberos/Dockerfile +++ b/testing/kerberos/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled # INSTALL KERBEROS RUN yum install -y krb5-libs krb5-server krb5-workstation \ diff --git a/testing/phoenix5/Dockerfile b/testing/phoenix5/Dockerfile index 5911836b..f66bfe13 100644 --- a/testing/phoenix5/Dockerfile +++ b/testing/phoenix5/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled ARG HBASE_VERSION=2.4.7 ARG ZOOKEEPER_VERSION=3.5.7 diff --git a/testing/spark3-delta/Dockerfile b/testing/spark3-delta/Dockerfile index 9efbd5ba..62a7c0b2 100644 --- a/testing/spark3-delta/Dockerfile +++ b/testing/spark3-delta/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled ARG SPARK_VERSION=3.2.1 ARG HADOOP_VERSION=3.2 diff --git a/testing/spark3.0-iceberg/Dockerfile b/testing/spark3.0-iceberg/Dockerfile index c4dd7ba7..468bc2cb 100644 --- a/testing/spark3.0-iceberg/Dockerfile +++ b/testing/spark3.0-iceberg/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM testing/centos7-oj11:unlabelled +FROM testing/centos7-oj17:unlabelled ARG SPARK_VERSION=3.2.1 ARG HADOOP_VERSION=3.2