SRE-3892 cq: install dependencies while building docker image

.dockerignore

@@ -21,6 +21,8 @@
 !utils/run_utest.py
 !utils/utest.yaml
 !utils/unit
+!utils/rpms
+!ci
 !SConstruct
 !VERSION
 !LICENSE

Jenkinsfile

@@ -840,13 +840,12 @@ pipeline {
                                                 ' --target build-ci' +
                                                 ' --build-arg REPOS="' + prRepos() + '"' +
                                                 ' --build-arg POINT_RELEASE=.7' +
-                                                " --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}"
+                                                " --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}" +
+                                                " --build-arg DAOS_DEPS_INSTALL=yes"
                         }
                     }
                     steps {
                         script {
-                            sh label: 'Install RPMs',
-                                script: './ci/rpm/install_deps.sh el9 "' + env.DAOS_RELVAL + '"'
                             sh label: 'Build deps',
                                 script: './ci/rpm/build_deps.sh'
                             job_step_update(
@@ -906,13 +905,12 @@ pipeline {
                                                 " -t ${sanitized_JOB_NAME()}-leap15" +
                                                 ' --target build-ci' +
                                                 ' --build-arg POINT_RELEASE=.6' +
-                                                " --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}"
+                                                " --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}" +
+                                                " --build-arg DAOS_DEPS_INSTALL=yes"
                         }
                     }
                     steps {
                         script {
-                            sh label: 'Install RPMs',
-                                script: './ci/rpm/install_deps.sh suse.lp156 "' + env.DAOS_RELVAL + '"'
                             sh label: 'Build deps',
                                 script: './ci/rpm/build_deps.sh'
                             job_step_update(

ci/parse_ci_envs.sh

@@ -9,10 +9,8 @@ if [ -n "${STAGE_NAME:?}" ]; then
   case $STAGE_NAME in
     *CentOS\ 9*|*EL\ 9*|*el9*|*centos9*)
       : "${TARGET:=centos9}"
-      : "${REPO_SPEC:=el-9}"
       ;;
     *SLES\ 15.7*|*sles15.7*)
-      : "${CHROOT_NAME:=sles-15-sp7-x86_64}"
       : "${TARGET:=sles15.7}"
       ;;
     *Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*)
@@ -29,20 +27,15 @@ if [ -n "${STAGE_NAME:?}" ]; then
       ;;
     *Leap\ 15*|*leap15*|*opensuse15*|*sles15*)
       : "${TARGET:=leap15}"
-      : "${REPO_SPEC:=sl-15}"
       ;;
     *Ubuntu\ 20.04*|*ubuntu2004*)
       : "${TARGET:=ubuntu20}"
-      : "${REPO_SPEC:=ubuntu-20.04}"
       ;;
     *Ubuntu\ 22.04*|*ubuntu2204*)
       : "${TARGET:=ubuntu22}"
-      : "${REPO_SPEC:=ubuntu-22.04}"
       ;;
     *Ubuntu\ 24.04*|*ubuntu2404*)
-      : "${CHROOT_NAME:="not_applicable"}"
       : "${TARGET:=ubuntu24}"
-      : "${REPO_SPEC:=ubuntu-24.04}"
       ;;
   esac
 fi

ci/rpm/install_deps.sh

@@ -10,17 +10,11 @@ if [ "$(id -u)" = "0" ]; then
 fi
 
 mydir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-ci_envs="$mydir/../parse_ci_envs.sh"
-if [ -e "${ci_envs}" ]; then
-  # shellcheck source=parse_ci_envs.sh disable=SC1091
-  source "${ci_envs}"
-fi
 
 env
 
 pushd "${mydir}/../.." || exit 1
 export DISTRO="${1}"
-export DAOS_RELVAL="${2}"
 libfabric_pkg="$(utils/rpms/package_version.sh libfabric dev)"
 mercury_pkg="$(utils/rpms/package_version.sh mercury dev)"
 argobots_pkg="$(utils/rpms/package_version.sh argobots dev)"

utils/docker/Dockerfile.el.9

@@ -100,6 +100,16 @@ RUN . /home/daos/venv/bin/activate &&                       \
     pip --no-cache-dir install -r requirements-build.txt && \
     rm -r requirements-build.txt
 
+# Install DAOS dependencies if available
+ARG DAOS_DEPS_INSTALL=yes
+RUN --mount=type=bind,source=ci/rpm/install_deps.sh,target=/tmp/daos/ci/rpm/install_deps.sh \
+    --mount=type=bind,source=ci/parse_ci_envs.sh,target=/tmp/daos/ci/parse_ci_envs.sh \
+    --mount=type=bind,source=utils/rpms/package_version.sh,target=/tmp/daos/utils/rpms/package_version.sh \
+    --mount=type=bind,source=utils/rpms/package_info.sh,target=/tmp/daos/utils/rpms/package_info.sh \
+    --mount=type=bind,source=utils/rpms/daos.spec,target=/tmp/daos/utils/rpms/daos.spec \
+    [ "$DAOS_DEPS_INSTALL" != "yes" ] || \
+        /tmp/daos/ci/rpm/install_deps.sh el9
+
 # Setup docker image for build using local copy of sources.
 # Include also clang and java compilers installation
 FROM build-ci AS build-local
@@ -210,6 +220,7 @@ RUN [ "$DAOS_BUILD" != "yes" ] || {                                     \
     }
 
 COPY --chown=daos_server:daos_server utils utils
+COPY --chown=daos_server:daos_server utils/rpms/daos.spec daos.spec
 
 # Build DAOS RPMs
 RUN [ "$DAOS_PACKAGES_BUILD" != "yes" ] || [ "$DAOS_BUILD" != "yes" ] || { \

utils/docker/Dockerfile.leap.15

@@ -114,6 +114,16 @@ RUN . /home/daos/venv/bin/activate &&                       \
     pip --no-cache-dir install -r requirements-build.txt && \
     rm -r requirements-build.txt
 
+# Install DAOS dependencies if available
+ARG DAOS_DEPS_INSTALL=yes
+RUN --mount=type=bind,source=ci/rpm/install_deps.sh,target=/tmp/daos/ci/rpm/install_deps.sh \
+    --mount=type=bind,source=ci/parse_ci_envs.sh,target=/tmp/daos/ci/parse_ci_envs.sh \
+    --mount=type=bind,source=utils/rpms/package_version.sh,target=/tmp/daos/utils/rpms/package_version.sh \
+    --mount=type=bind,source=utils/rpms/package_info.sh,target=/tmp/daos/utils/rpms/package_info.sh \
+    --mount=type=bind,source=utils/rpms/daos.spec,target=/tmp/daos/utils/rpms/daos.spec \
+    [ "$DAOS_DEPS_INSTALL" != "yes" ] || \
+        /tmp/daos/ci/rpm/install_deps.sh suse.lp156
+
 # Setup docker image for build using local copy of sources.
 # Include also clang and java compilers installation
 FROM build-ci AS build-local
@@ -224,6 +234,7 @@ RUN [ "$DAOS_BUILD" != "yes" ] || {                                     \
     }
 
 COPY --chown=daos_server:daos_server utils utils
+COPY --chown=daos_server:daos_server utils/rpms/daos.spec daos.spec
 
 # Build DAOS RPMs
 RUN [ "$DAOS_PACKAGES_BUILD" != "yes" ] || [ "$DAOS_BUILD" != "yes" ] || { \

utils/rpms/daos.sh

@@ -14,14 +14,19 @@ if [ -z "${SL_PREFIX:-}" ]; then
   echo "daos is not built"
   exit 1
 fi
-
 daoshome="${prefix}/lib/daos"
 server_svc_name="daos_server.service"
 agent_svc_name="daos_agent.service"
 sysctl_script_name="10-daos_server.conf"
 daos_sys_dir="/var/daos"
 daos_log_dir="/var/log/daos"
 
+distro_name=".${DISTRO:-el9}"
+daos_version="$(grep "^Version: " "${root}/utils/rpms/daos.spec" | \
+                sed 's/^Version: *//')"
+daos_release="$(grep "^Release: " "${root}/utils/rpms/daos.spec" | \
+                sed 's/^Release: *//' | \
+                sed 's/%.*//')${DAOS_RELVAL:-}${distro_name}"
 VERSION=${daos_version}
 RELEASE=${daos_release}
 LICENSE="BSD-2-Clause-Patent"

utils/rpms/package_info.sh

@@ -5,7 +5,6 @@
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
-root="$(realpath "$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")")"
 set_lib_name() {
   comp="$1"; shift
   vartype="$1"; shift
@@ -34,11 +33,6 @@ set_lib_name() {
 }
 
 distro_name=".${DISTRO:-el9}"
-daos_version="$(grep "^Version: " "${root}/utils/rpms/daos.spec" | sed 's/^Version: *//')"
-export daos_version
-daos_release="$(grep "^Release: " "${root}/utils/rpms/daos.spec" | \
-  sed 's/^Release: *//' | sed 's/%.*//')${DAOS_RELVAL:-}${distro_name}"
-export daos_release
 
 export libfabric_min_version="1.20"
 export libfabric_version="1.22.0"