diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ef6c79b..63cfe2ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,12 +12,12 @@ jobs: include: - image: accumulo test: accumulo - - image: centos7-oj17 + - image: almalinux9-oj17 platforms: linux/amd64,linux/arm64 - - image: centos7-oj17-openldap-referrals + - image: almalinux9-oj17-openldap-referrals platforms: linux/amd64,linux/arm64 test: openldap - - image: centos7-oj17-openldap-active-directory + - image: almalinux9-oj17-openldap-active-directory platforms: linux/amd64,linux/arm64 test: openldap-active-directory - image: spark3-iceberg diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea445105..63a2feb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: exit 0 fi skipped_images=( - testing/centos7-oj17-openldap-base + testing/almalinux9-oj17-openldap-base ) single_arch=( testing/accumulo @@ -79,11 +79,11 @@ jobs: testing/hdp3.1-hive-kerberized-kms ) multi_arch=( - testing/centos7-oj11 - testing/centos7-oj17 - testing/centos7-oj17-openldap - testing/centos7-oj17-openldap-referrals - testing/centos7-oj17-openldap-active-directory + testing/almalinux9-oj11 + testing/almalinux9-oj17 + testing/almalinux9-oj17-openldap + testing/almalinux9-oj17-openldap-referrals + testing/almalinux9-oj17-openldap-active-directory testing/hive3.1-hive testing/kerberos testing/phoenix5 diff --git a/archived/hdp3.1-hive/Dockerfile b/archived/hdp3.1-hive/Dockerfile index 7bec7ff4..bf524f04 100644 --- a/archived/hdp3.1-hive/Dockerfile +++ b/archived/hdp3.1-hive/Dockerfile @@ -41,7 +41,7 @@ RUN yum install -y \ lzo-devel \ lzop \ - # Mysql is not present in Centos7 repositories, use mariadb as a replacement + # Mysql is not present in Alma Linux 9 repositories, use mariadb as a replacement mariadb-server \ mysql-connector-java \ diff --git a/bin/test.sh b/bin/test.sh index 1b823083..cee3631c 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -58,7 +58,7 @@ function run_hive_transactional_tests() { } function check_spark() { - environment_compose exec spark curl -f http://localhost:10213 + environment_compose exec spark curl --http0.9 -f http://localhost:10213 -o /dev/null } function run_spark_tests() { diff --git a/etc/compose/openldap-active-directory/docker-compose.yml b/etc/compose/openldap-active-directory/docker-compose.yml index 59d4e3ea..ddcbf633 100644 --- a/etc/compose/openldap-active-directory/docker-compose.yml +++ b/etc/compose/openldap-active-directory/docker-compose.yml @@ -1,4 +1,4 @@ version: '2.0' services: openldap: - image: testing/centos7-oj17-openldap-active-directory:latest$ARCH + image: testing/almalinux9-oj17-openldap-active-directory:latest$ARCH diff --git a/etc/compose/openldap/docker-compose.yml b/etc/compose/openldap/docker-compose.yml index 9283ca45..a5354048 100644 --- a/etc/compose/openldap/docker-compose.yml +++ b/etc/compose/openldap/docker-compose.yml @@ -1,4 +1,4 @@ version: '2.0' services: openldap: - image: testing/centos7-oj17-openldap:latest$ARCH + image: testing/almalinux9-oj17-openldap:latest$ARCH diff --git a/testing/accumulo/Dockerfile b/testing/accumulo/Dockerfile index 38a4713a..041eff2d 100644 --- a/testing/accumulo/Dockerfile +++ b/testing/accumulo/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj11:unlabelled$ARCH +FROM testing/almalinux9-oj11:unlabelled$ARCH ARG ACCUMULO_VERSION=3.0.0 ARG HADOOP_VERSION=3.3.5 diff --git a/testing/centos7-oj11/Dockerfile b/testing/almalinux9-oj11/Dockerfile similarity index 94% rename from testing/centos7-oj11/Dockerfile rename to testing/almalinux9-oj11/Dockerfile index 60ed775a..6c50ae30 100644 --- a/testing/centos7-oj11/Dockerfile +++ b/testing/almalinux9-oj11/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM library/centos:7 +FROM library/almalinux:9 COPY ./files / @@ -30,7 +30,7 @@ RUN \ alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \ \ # install supervisor - yum --enablerepo=extras install -y setuptools epel-release && \ + yum --enablerepo=extras install -y epel-release && \ yum install -y supervisor && \ \ # install commonly needed packages diff --git a/testing/centos7-oj11/files/opt/trinodev/site-override.xslt b/testing/almalinux9-oj11/files/opt/trinodev/site-override.xslt similarity index 100% rename from testing/centos7-oj11/files/opt/trinodev/site-override.xslt rename to testing/almalinux9-oj11/files/opt/trinodev/site-override.xslt diff --git a/testing/centos7-oj11/files/usr/local/bin/apply-all-site-xml-overrides b/testing/almalinux9-oj11/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/almalinux9-oj11/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/almalinux9-oj11/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/almalinux9-oj11/files/usr/local/bin/apply-site-xml-override diff --git a/testing/centos7-oj17-openldap-active-directory/Dockerfile b/testing/almalinux9-oj17-openldap-active-directory/Dockerfile similarity index 94% rename from testing/centos7-oj17-openldap-active-directory/Dockerfile rename to testing/almalinux9-oj17-openldap-active-directory/Dockerfile index d9d816a8..db0a79a3 100644 --- a/testing/centos7-oj17-openldap-active-directory/Dockerfile +++ b/testing/almalinux9-oj17-openldap-active-directory/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17-openldap-base:unlabelled$ARCH +FROM testing/almalinux9-oj17-openldap-base:unlabelled$ARCH # COPY CONFIGURATION COPY ./files / diff --git a/testing/centos7-oj17-openldap-active-directory/files/etc/openldap/setup/msuser.ldif b/testing/almalinux9-oj17-openldap-active-directory/files/etc/openldap/setup/msuser.ldif similarity index 100% rename from testing/centos7-oj17-openldap-active-directory/files/etc/openldap/setup/msuser.ldif rename to testing/almalinux9-oj17-openldap-active-directory/files/etc/openldap/setup/msuser.ldif diff --git a/testing/centos7-oj17-openldap-base/Dockerfile b/testing/almalinux9-oj17-openldap-base/Dockerfile similarity index 98% rename from testing/centos7-oj17-openldap-base/Dockerfile rename to testing/almalinux9-oj17-openldap-base/Dockerfile index 4e0fb09f..6851598e 100644 --- a/testing/centos7-oj17-openldap-base/Dockerfile +++ b/testing/almalinux9-oj17-openldap-base/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17:unlabelled$ARCH +FROM testing/almalinux9-oj17:unlabelled$ARCH # INSTALL OPENLDAP RUN yum -y install openssl openldap openldap-clients openldap-servers \ diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/certs/active-directory-certificate.crt b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/active-directory-certificate.crt similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/certs/active-directory-certificate.crt rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/active-directory-certificate.crt diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/certs/openldap-certificate.pem b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/openldap-certificate.pem similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/certs/openldap-certificate.pem rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/openldap-certificate.pem diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/certs/private.pem b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/private.pem similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/certs/private.pem rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/private.pem diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/certs/serial.txt b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/serial.txt similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/certs/serial.txt rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/serial.txt diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/certs/trino-coordinator-for-ldap.pem b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/trino-coordinator-for-ldap.pem similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/certs/trino-coordinator-for-ldap.pem rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/certs/trino-coordinator-for-ldap.pem diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/setup/createOU.ldif b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/createOU.ldif similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/setup/createOU.ldif rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/createOU.ldif diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/setup/ldap_disable_bind_anon.ldif b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/ldap_disable_bind_anon.ldif similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/setup/ldap_disable_bind_anon.ldif rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/ldap_disable_bind_anon.ldif diff --git a/testing/centos7-oj17-openldap-base/files/etc/openldap/setup/modify_server.ldif b/testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/modify_server.ldif similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/openldap/setup/modify_server.ldif rename to testing/almalinux9-oj17-openldap-base/files/etc/openldap/setup/modify_server.ldif diff --git a/testing/centos7-oj17-openldap-base/files/etc/supervisord.conf b/testing/almalinux9-oj17-openldap-base/files/etc/supervisord.conf similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/supervisord.conf rename to testing/almalinux9-oj17-openldap-base/files/etc/supervisord.conf diff --git a/testing/centos7-oj17-openldap-base/files/etc/supervisord.d/slapd.conf b/testing/almalinux9-oj17-openldap-base/files/etc/supervisord.d/slapd.conf similarity index 100% rename from testing/centos7-oj17-openldap-base/files/etc/supervisord.d/slapd.conf rename to testing/almalinux9-oj17-openldap-base/files/etc/supervisord.d/slapd.conf diff --git a/testing/centos7-oj17-openldap-base/files/usr/bin/wait-for-slapd.sh b/testing/almalinux9-oj17-openldap-base/files/usr/bin/wait-for-slapd.sh similarity index 100% rename from testing/centos7-oj17-openldap-base/files/usr/bin/wait-for-slapd.sh rename to testing/almalinux9-oj17-openldap-base/files/usr/bin/wait-for-slapd.sh diff --git a/testing/centos7-oj17-openldap-base/generate-certificates.md b/testing/almalinux9-oj17-openldap-base/generate-certificates.md similarity index 100% rename from testing/centos7-oj17-openldap-base/generate-certificates.md rename to testing/almalinux9-oj17-openldap-base/generate-certificates.md diff --git a/testing/centos7-oj17-openldap-referrals/Dockerfile b/testing/almalinux9-oj17-openldap-referrals/Dockerfile similarity index 94% rename from testing/centos7-oj17-openldap-referrals/Dockerfile rename to testing/almalinux9-oj17-openldap-referrals/Dockerfile index 7f18c763..e442c7fd 100644 --- a/testing/centos7-oj17-openldap-referrals/Dockerfile +++ b/testing/almalinux9-oj17-openldap-referrals/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17-openldap:unlabelled$ARCH +FROM testing/almalinux9-oj17-openldap:unlabelled$ARCH # COPY CONFIGURATION COPY ./files / diff --git a/testing/centos7-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif b/testing/almalinux9-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif similarity index 100% rename from testing/centos7-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif rename to testing/almalinux9-oj17-openldap-referrals/files/etc/openldap/setup/createReferrals.ldif diff --git a/testing/centos7-oj17-openldap/Dockerfile b/testing/almalinux9-oj17-openldap/Dockerfile similarity index 94% rename from testing/centos7-oj17-openldap/Dockerfile rename to testing/almalinux9-oj17-openldap/Dockerfile index 1457fbb6..52c46b12 100644 --- a/testing/centos7-oj17-openldap/Dockerfile +++ b/testing/almalinux9-oj17-openldap/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17-openldap-base:unlabelled$ARCH +FROM testing/almalinux9-oj17-openldap-base:unlabelled$ARCH # COPY CONFIGURATION COPY ./files / diff --git a/testing/centos7-oj17-openldap/files/etc/openldap/setup/memberof.ldif b/testing/almalinux9-oj17-openldap/files/etc/openldap/setup/memberof.ldif similarity index 100% rename from testing/centos7-oj17-openldap/files/etc/openldap/setup/memberof.ldif rename to testing/almalinux9-oj17-openldap/files/etc/openldap/setup/memberof.ldif diff --git a/testing/centos7-oj17-openldap/files/etc/openldap/setup/refint.ldif b/testing/almalinux9-oj17-openldap/files/etc/openldap/setup/refint.ldif similarity index 100% rename from testing/centos7-oj17-openldap/files/etc/openldap/setup/refint.ldif rename to testing/almalinux9-oj17-openldap/files/etc/openldap/setup/refint.ldif diff --git a/testing/centos7-oj17/Dockerfile b/testing/almalinux9-oj17/Dockerfile similarity index 94% rename from testing/centos7-oj17/Dockerfile rename to testing/almalinux9-oj17/Dockerfile index 4b08a3a1..d5713bab 100644 --- a/testing/centos7-oj17/Dockerfile +++ b/testing/almalinux9-oj17/Dockerfile @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM library/centos:7 +FROM library/almalinux:9 COPY ./files / @@ -30,7 +30,7 @@ RUN \ alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \ \ # install supervisor - yum --enablerepo=extras install -y setuptools epel-release && \ + yum --enablerepo=extras install -y epel-release && \ yum install -y supervisor && \ \ # install commonly needed packages diff --git a/testing/centos7-oj17/files/opt/trinodev/site-override.xslt b/testing/almalinux9-oj17/files/opt/trinodev/site-override.xslt similarity index 100% rename from testing/centos7-oj17/files/opt/trinodev/site-override.xslt rename to testing/almalinux9-oj17/files/opt/trinodev/site-override.xslt diff --git a/testing/centos7-oj17/files/usr/local/bin/apply-all-site-xml-overrides b/testing/almalinux9-oj17/files/usr/local/bin/apply-all-site-xml-overrides similarity index 100% rename from testing/centos7-oj17/files/usr/local/bin/apply-all-site-xml-overrides rename to testing/almalinux9-oj17/files/usr/local/bin/apply-all-site-xml-overrides diff --git a/testing/centos7-oj17/files/usr/local/bin/apply-site-xml-override b/testing/almalinux9-oj17/files/usr/local/bin/apply-site-xml-override similarity index 100% rename from testing/centos7-oj17/files/usr/local/bin/apply-site-xml-override rename to testing/almalinux9-oj17/files/usr/local/bin/apply-site-xml-override diff --git a/testing/hdp3.1-hive/Dockerfile b/testing/hdp3.1-hive/Dockerfile index 3d13bbc4..66ec1526 100644 --- a/testing/hdp3.1-hive/Dockerfile +++ b/testing/hdp3.1-hive/Dockerfile @@ -17,6 +17,10 @@ FROM ghcr.io/trinodb/testing/hdp3.1-hive:38 COPY ./files / +# replace mirrorlist.centos.org and mirror.centos.org with vault.centos.org +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + RUN \ set -xeu && \ # Remove unaccessible HDP3 repos so yum is still usable diff --git a/testing/hive3.1-hive/Dockerfile b/testing/hive3.1-hive/Dockerfile index 17c4c12d..06fd1fcb 100644 --- a/testing/hive3.1-hive/Dockerfile +++ b/testing/hive3.1-hive/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17:unlabelled$ARCH +FROM testing/almalinux9-oj17:unlabelled$ARCH ARG JAVA8_ZULU_VERSION=8.64.0.19-ca-jdk8.0.345 @@ -21,6 +21,7 @@ RUN yum install -y \ openssh-clients \ openssh-server \ psmisc \ + passwd \ which && \ # Install Zulu JDK echo "Downloading zulu${JAVA8_ZULU_VERSION}-linux.$(uname -m).rpm..." && \ @@ -32,7 +33,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-oj17 +# Override JAVA_HOME inherited from testing/almalinux9-oj17 ENV JAVA_HOME=/usr/lib/jvm/zulu-8 ARG HADOOP_VERSION=3.1.2 diff --git a/testing/hive3.1-hive/files/root/setup.sh b/testing/hive3.1-hive/files/root/setup.sh index 70c58785..3fa2841f 100755 --- a/testing/hive3.1-hive/files/root/setup.sh +++ b/testing/hive3.1-hive/files/root/setup.sh @@ -6,16 +6,16 @@ mkdir /var/log/mysql /var/log/hive /var/log/hadoop-hdfs mysql_install_db chown -R mysql:mysql /var/lib/mysql +chown -R mysql:mysql /var/log/mariadb /usr/bin/mysqld_safe & sleep 10s -echo "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; FLUSH PRIVILEGES;" | mysql +echo "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES;" | mysql echo "CREATE DATABASE metastore;" | mysql /usr/bin/mysqladmin -u root password 'root' /opt/hive/bin/schematool -dbType mysql -initSchema -killall mysqld sleep 10s chown -R mysql:mysql /var/log/mysql/ rm -rf /tmp/* /var/tmp/* diff --git a/testing/kerberos/Dockerfile b/testing/kerberos/Dockerfile index 60a2aece..630cefbf 100644 --- a/testing/kerberos/Dockerfile +++ b/testing/kerberos/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj17:unlabelled$ARCH +FROM testing/almalinux9-oj17:unlabelled$ARCH ARG ADDPRINC_ARGS="-maxrenewlife \"10 days\" +allow_renewable" diff --git a/testing/phoenix5/Dockerfile b/testing/phoenix5/Dockerfile index 687f6080..5e026fde 100644 --- a/testing/phoenix5/Dockerfile +++ b/testing/phoenix5/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj11:unlabelled$ARCH +FROM testing/almalinux9-oj11:unlabelled$ARCH ARG HBASE_VERSION=2.5.8 ARG ZOOKEEPER_VERSION=3.9.2 diff --git a/testing/spark3-delta/Dockerfile b/testing/spark3-delta/Dockerfile index 8d3e4a86..c0f5f5a0 100644 --- a/testing/spark3-delta/Dockerfile +++ b/testing/spark3-delta/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj11:unlabelled$ARCH +FROM testing/almalinux9-oj11:unlabelled$ARCH ARG SPARK_VERSION=3.5.0 ARG HADOOP_VERSION=3 diff --git a/testing/spark3-hudi/Dockerfile b/testing/spark3-hudi/Dockerfile index ee2a9417..6790b2de 100644 --- a/testing/spark3-hudi/Dockerfile +++ b/testing/spark3-hudi/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj11:unlabelled$ARCH +FROM testing/almalinux9-oj11:unlabelled$ARCH ARG SPARK_VERSION=3.3.1 ARG HADOOP_VERSION=3 diff --git a/testing/spark3-iceberg/Dockerfile b/testing/spark3-iceberg/Dockerfile index 2d96eed2..41d9ccf4 100644 --- a/testing/spark3-iceberg/Dockerfile +++ b/testing/spark3-iceberg/Dockerfile @@ -11,7 +11,7 @@ # limitations under the License. ARG ARCH -FROM testing/centos7-oj11:unlabelled$ARCH +FROM testing/almalinux9-oj11:unlabelled$ARCH ARG SPARK_VERSION=3.4.2 ARG HADOOP_VERSION=3