From 31f24b9eecd1416885b63bb765951685688b0aec Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Fri, 7 Feb 2025 15:24:31 +0100 Subject: [PATCH 1/2] Update test package oracle --- .../_dev/test/system/test-memory-config.yml | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml b/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml index 465fc320f9..ebd5e2d9cc 100644 --- a/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml +++ b/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml @@ -8,16 +8,34 @@ agent: contents: | set -eu if grep wolfi /etc/os-release > /dev/null ; then - apk update && apk add libaio wget unzip + apk update + apk add libaio wget unzip + elif grep "Red Hat" /etc/os-release > /dev/null ; then + microdnf update -y + microdnf install -y libaio wget unzip + microdnf clean all + elif grep "Ubuntu" /etc/os-release > /dev/null ; then + apt-get update + if grep "Ubuntu 24" /etc/os-release > /dev/null; then + # Error when installing libaio1 + # Package libaio1 is not available, but is referred to by another package. + apt-get -y install libaio1t64 wget unzip + # Applied fix described in: https://forums.oracle.com/ords/apexds/post/instant-client-on-ubuntu-24-04-noble-numbat-7244 + ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1 + else + apt-get -y install libaio1 wget unzip + fi else - apt-get update && apt-get -y install libaio1 wget unzip + echo "Unsupported OS" + exit 1 fi mkdir -p /opt/oracle cd /opt/oracle wget https://download.oracle.com/otn_software/linux/instantclient/214000/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip && unzip -o instantclient-basic-linux.x64-21.4.0.0.0dbru.zip || exit 1 wget https://download.oracle.com/otn_software/linux/instantclient/217000/instantclient-sqlplus-linux.x64-21.7.0.0.0dbru.zip && unzip -o instantclient-sqlplus-linux.x64-21.7.0.0.0dbru.zip || exit 1 mkdir -p /etc/ld.so.conf.d/ - echo /opt/oracle/instantclient_21_4 > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig || exit 1 + echo /opt/oracle/instantclient_21_4 > /etc/ld.so.conf.d/oracle-instantclient.conf + ldconfig cp /opt/oracle/instantclient_21_7/glogin.sql /opt/oracle/instantclient_21_7/libsqlplus.so /opt/oracle/instantclient_21_7/libsqlplusic.so /opt/oracle/instantclient_21_7/sqlplus /opt/oracle/instantclient_21_4/ pre_start_script: language: "sh" From 17b76635994ca5ee61716382a4cf36bc7a454542 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Mon, 10 Feb 2025 10:48:38 +0100 Subject: [PATCH 2/2] Use grep parameter to avoid printing matching lines --- .../memory/_dev/test/system/test-memory-config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml b/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml index ebd5e2d9cc..0f205a919f 100644 --- a/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml +++ b/test/packages/parallel/oracle/data_stream/memory/_dev/test/system/test-memory-config.yml @@ -7,16 +7,16 @@ agent: language: "sh" contents: | set -eu - if grep wolfi /etc/os-release > /dev/null ; then + if grep -q wolfi /etc/os-release ; then apk update apk add libaio wget unzip - elif grep "Red Hat" /etc/os-release > /dev/null ; then + elif grep -q "Red Hat" /etc/os-release ; then microdnf update -y microdnf install -y libaio wget unzip microdnf clean all - elif grep "Ubuntu" /etc/os-release > /dev/null ; then + elif grep -q "Ubuntu" /etc/os-release ; then apt-get update - if grep "Ubuntu 24" /etc/os-release > /dev/null; then + if grep -q "Ubuntu 24" /etc/os-release ; then # Error when installing libaio1 # Package libaio1 is not available, but is referred to by another package. apt-get -y install libaio1t64 wget unzip