From 7c68fb432430d439912f54934b41eb3e567f6f47 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Tue, 6 Jun 2023 08:33:42 +0200 Subject: [PATCH] Increase timeout for ran-base build, print os release, change of cmake on rhel distro --- ci-scripts/cls_cluster.py | 2 +- cmake_targets/tools/build_helper | 2 +- docker/Dockerfile.base.rhel9 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 786cb55ed2..56c60f7551 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -306,7 +306,7 @@ class Cluster: self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml') ranbase_job = self._start_build('ran-base') attemptedImages += ['ran-base'] - status = ranbase_job is not None and self._wait_build_end([ranbase_job], 600) + status = ranbase_job is not None and self._wait_build_end([ranbase_job], 800) if not status: logging.error('failure during build of ran-base') self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect # recover logs by mounting image diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 0277127bc1..52ae420081 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g") OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g") case "$OS_DISTRO" in fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; - rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;; + rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;; debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9 index a48ae840eb..56b1ce7a23 100644 --- a/docker/Dockerfile.base.rhel9 +++ b/docker/Dockerfile.base.rhel9 @@ -44,6 +44,7 @@ ENV SMDEV_CONTAINER_OFF=1 RUN rm -f /etc/rhsm-host && \ subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \ dnf update -y && \ + cat /etc/os-release && \ dnf install -y \ #gcc needed for build_oai gcc gcc-c++ \