src/script: rename CEPH_BRANCH to CEPH_BASE_BRANCH for build container

Previously, we were passing build argument of CEPH_BRANCH, but that was
a bit misleading as we expect the current branch to vary a bit (as users
will be using branches to develop and test the code). What we actually
care about is the base branch ('main', 'squid', etc) as that is fed into
our bootstrap script and we want the option to simple variations based
on the name of said base branch.
Rename CEPH_BRANCH to CEPH_BASE_BRANCH for clarity.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/Dockerfile.build b/Dockerfile.build
index cece359e13aaec8ce7390733132adfc3a59efb7d..405d201f955e3f8a7b61e30dce0f0f4cc62b7e4c 100644 (file)
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -21,12 +21,12 @@ ENV FOR_MAKE_CHECK=1
 ARG DISTRO
 ARG CEPH_CTR_SRC=/usr/local/src/ceph
 ARG CLEAN_DNF=yes
-ARG CEPH_BRANCH=main
+ARG CEPH_BASE_BRANCH=main
 COPY --from=bootstrap ${CEPH_CTR_SRC} ${CEPH_CTR_SRC}
 # Note that we do not use ENV for the following. This is because we do not
 # want them permamently stored in the container's layer.
 RUN DISTRO=$DISTRO \
-    CEPH_BRANCH=$CEPH_BRANCH \
+    CEPH_BASE_BRANCH=$CEPH_BASE_BRANCH \
     CLEAN_DNF=$CLEAN_DNF \
     CEPH_CTR_SRC=${CEPH_CTR_SRC} \
     bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh

diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh
index 82ca11e88ed29c66b38f17fcae72e1817d224581..1920883e5522b53aeb0dcc45f325707b05296e05 100644 (file)
--- a/src/script/buildcontainer-setup.sh
+++ b/src/script/buildcontainer-setup.sh
@@ -26,7 +26,7 @@ fi
 # ceph for the given <branch>~<distro_kind> pair. Some distros need extra
 # tools in the container image vs. vm hosts or extra tools needed to build
 # packages etc.
-case "${CEPH_BRANCH}~${DISTRO_KIND}" in
+case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in
     *~*centos*8)
         dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget
         install_container_deps
@@ -43,7 +43,7 @@ case "${CEPH_BRANCH}~${DISTRO_KIND}" in
         install_container_deps
     ;;
     *)
-        echo "Unknown action, branch or build: ${CEPH_BRANCH}~${DISTRO_KIND}" >&2
+        echo "Unknown action, branch or build: ${CEPH_BASE_BRANCH}~${DISTRO_KIND}" >&2
         exit 2
     ;;
 esac