Migrate from CentOS to Alma Linux 9

trinodb · Jul 7, 2024 · 7e3bc50 · 7e3bc50
1 parent 8064bb8
commit 7e3bc50
Show file tree

Hide file tree

Showing 43 changed files with 43 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → testing/almalinux9-oj11/Dockerfile b/testing/centos7-oj11/Dockerfile → 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 /
 
@@ -19,6 +19,7 @@ RUN \
     set -xeu && \
     yum update -y && \
     yum install -y \
+        python \
         nc \
         wget \
         && \
@@ -30,7 +31,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
@@ -41,6 +42,7 @@ RUN \
         telnet `# helpful when troubleshooting product tests` \
         vim `# helpful when troubleshooting product tests` \
         jq `# helpful json processing tool` \
+        procps \
         && \
     # cleanup
     yum -y clean all && rm -rf /tmp/* /var/tmp/*

diff --git a/...j11/files/opt/trinodev/site-override.xslt → ...j11/files/opt/trinodev/site-override.xslt b/...j11/files/opt/trinodev/site-override.xslt → ...j11/files/opt/trinodev/site-override.xslt
diff --git a/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides b/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides
diff --git a/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override b/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override
diff --git a/...oj17-openldap-active-directory/Dockerfile → ...oj17-openldap-active-directory/Dockerfile b/...oj17-openldap-active-directory/Dockerfile → ...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/...tory/files/etc/openldap/setup/msuser.ldif → ...tory/files/etc/openldap/setup/msuser.ldif b/...tory/files/etc/openldap/setup/msuser.ldif → ...tory/files/etc/openldap/setup/msuser.ldif
diff --git a/...ing/centos7-oj17-openldap-base/Dockerfile → .../almalinux9-oj17-openldap-base/Dockerfile b/...ing/centos7-oj17-openldap-base/Dockerfile → .../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/...ap/certs/active-directory-certificate.crt → ...ap/certs/active-directory-certificate.crt b/...ap/certs/active-directory-certificate.crt → ...ap/certs/active-directory-certificate.crt
diff --git a/...c/openldap/certs/openldap-certificate.pem → ...c/openldap/certs/openldap-certificate.pem b/...c/openldap/certs/openldap-certificate.pem → ...c/openldap/certs/openldap-certificate.pem
diff --git a/...base/files/etc/openldap/certs/private.pem → ...base/files/etc/openldap/certs/private.pem b/...base/files/etc/openldap/certs/private.pem → ...base/files/etc/openldap/certs/private.pem
diff --git a/...-base/files/etc/openldap/certs/serial.txt → ...-base/files/etc/openldap/certs/serial.txt b/...-base/files/etc/openldap/certs/serial.txt → ...-base/files/etc/openldap/certs/serial.txt
diff --git a/...ldap/certs/trino-coordinator-for-ldap.pem → ...ldap/certs/trino-coordinator-for-ldap.pem b/...ldap/certs/trino-coordinator-for-ldap.pem → ...ldap/certs/trino-coordinator-for-ldap.pem
diff --git a/...se/files/etc/openldap/setup/createOU.ldif → ...se/files/etc/openldap/setup/createOU.ldif b/...se/files/etc/openldap/setup/createOU.ldif → ...se/files/etc/openldap/setup/createOU.ldif
diff --git a/...penldap/setup/ldap_disable_bind_anon.ldif → ...penldap/setup/ldap_disable_bind_anon.ldif b/...penldap/setup/ldap_disable_bind_anon.ldif → ...penldap/setup/ldap_disable_bind_anon.ldif
diff --git a/...les/etc/openldap/setup/modify_server.ldif → ...les/etc/openldap/setup/modify_server.ldif b/...les/etc/openldap/setup/modify_server.ldif → ...les/etc/openldap/setup/modify_server.ldif
@@ -1,4 +1,4 @@
-dn: olcDatabase={2}hdb,cn=config
+dn: olcDatabase={2}mdb,cn=config
 changetype: modify
 replace: olcRootDN
 olcRootDN: cn=admin,dc=trino,dc=testldap,dc=com

diff --git a/...-openldap-base/files/etc/supervisord.conf → ...-openldap-base/files/etc/supervisord.conf b/...-openldap-base/files/etc/supervisord.conf → ...-openldap-base/files/etc/supervisord.conf
diff --git a/...p-base/files/etc/supervisord.d/slapd.conf → ...p-base/files/etc/supervisord.d/slapd.conf b/...p-base/files/etc/supervisord.d/slapd.conf → ...p-base/files/etc/supervisord.d/slapd.conf
diff --git a/...ldap-base/files/usr/bin/wait-for-slapd.sh → ...ldap-base/files/usr/bin/wait-for-slapd.sh b/...ldap-base/files/usr/bin/wait-for-slapd.sh → ...ldap-base/files/usr/bin/wait-for-slapd.sh
diff --git a/...17-openldap-base/generate-certificates.md → ...17-openldap-base/generate-certificates.md b/...17-openldap-base/generate-certificates.md → ...17-openldap-base/generate-certificates.md
diff --git a/...entos7-oj17-openldap-referrals/Dockerfile → ...linux9-oj17-openldap-referrals/Dockerfile b/...entos7-oj17-openldap-referrals/Dockerfile → ...linux9-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/...s/etc/openldap/setup/createReferrals.ldif → ...s/etc/openldap/setup/createReferrals.ldif b/...s/etc/openldap/setup/createReferrals.ldif → ...s/etc/openldap/setup/createReferrals.ldif
diff --git a/testing/centos7-oj17-openldap/Dockerfile → testing/almalinux9-oj17-openldap/Dockerfile b/testing/centos7-oj17-openldap/Dockerfile → 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/...ap/files/etc/openldap/setup/memberof.ldif → ...ap/files/etc/openldap/setup/memberof.ldif b/...ap/files/etc/openldap/setup/memberof.ldif → ...ap/files/etc/openldap/setup/memberof.ldif
@@ -5,7 +5,7 @@ objectClass: olcModuleList
 olcModuleLoad: memberof.la
 olcModulePath: /usr/lib64/openldap
 
-dn: olcOverlay={0}memberof,olcDatabase={2}hdb,cn=config
+dn: olcOverlay={0}memberof,olcDatabase={2}mdb,cn=config
 objectClass: olcConfig
 objectClass: olcMemberOf
 objectClass: olcOverlayConfig

diff --git a/...ldap/files/etc/openldap/setup/refint.ldif → ...ldap/files/etc/openldap/setup/refint.ldif b/...ldap/files/etc/openldap/setup/refint.ldif → ...ldap/files/etc/openldap/setup/refint.ldif
@@ -6,7 +6,7 @@ objectclass: olcModuleList
 objectclass: top
 olcmoduleload: refint.la
 
-dn: olcOverlay={1}refint,olcDatabase={2}hdb,cn=config
+dn: olcOverlay={1}refint,olcDatabase={2}mdb,cn=config
 objectClass: olcConfig
 objectClass: olcOverlayConfig
 objectClass: olcRefintConfig

diff --git a/testing/centos7-oj17/Dockerfile → testing/almalinux9-oj17/Dockerfile b/testing/centos7-oj17/Dockerfile → 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 /
 
@@ -19,6 +19,7 @@ RUN \
     set -xeu && \
     yum update -y && \
     yum install -y \
+        python \
         nc \
         wget \
         && \
@@ -30,7 +31,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
@@ -41,6 +42,7 @@ RUN \
         telnet `# helpful when troubleshooting product tests` \
         vim `# helpful when troubleshooting product tests` \
         jq `# helpful json processing tool` \
+        procps \
         && \
     # cleanup
     yum -y clean all && rm -rf /tmp/* /var/tmp/*

diff --git a/...j17/files/opt/trinodev/site-override.xslt → ...j17/files/opt/trinodev/site-override.xslt b/...j17/files/opt/trinodev/site-override.xslt → ...j17/files/opt/trinodev/site-override.xslt
diff --git a/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides b/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides
diff --git a/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override b/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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