From f0d39d986f4a10f99f36352afa37896830eacc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Sch=C3=BCller?= Date: Wed, 4 Jun 2025 15:52:55 +0200 Subject: [PATCH] test/cases/oci: improve CI output Avoid error message where this is no error. --- test/cases/api/oci.sh | 2 +- test/cases/oci.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/cases/api/oci.sh b/test/cases/api/oci.sh index 432c48cf8..89f61c06c 100644 --- a/test/cases/api/oci.sh +++ b/test/cases/api/oci.sh @@ -38,7 +38,7 @@ region=${OCI_REGION} EOF function installClient() { - if ! hash oci; then + if ! hash oci 2>/dev/null; then echo "Using 'oci' from a container" sudo "${CONTAINER_RUNTIME}" pull "${CONTAINER_IMAGE_CLOUD_TOOLS}" diff --git a/test/cases/oci.sh b/test/cases/oci.sh index 81aeb7fa9..f94cde4cd 100755 --- a/test/cases/oci.sh +++ b/test/cases/oci.sh @@ -85,7 +85,7 @@ tenancy=${OCI_TENANCY} region=${OCI_REGION} EOF -if ! hash oci; then +if ! hash oci 2>/dev/null; then echo "Using 'oci' from a container" sudo "${CONTAINER_RUNTIME}" pull ${CONTAINER_IMAGE_CLOUD_TOOLS} @@ -101,6 +101,8 @@ else echo "Using pre-installed 'oci' from the system" OCI_CMD="oci --config-file $OCI_CONFIG --region $OCI_REGION" fi + +echo -n "OCI version: " $OCI_CMD --version $OCI_CMD setup repair-file-permissions --file "${TEMPDIR}/priv_key.pem" $OCI_CMD setup repair-file-permissions --file "$OCI_CONFIG"