ceph-*-build: pass OSD_FLAVOR to build-push-ceph-container-imgs.sh

so it is able to get the correct REPO_URL and push the container image
with the correct tag

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 7b390c939cfaa9d17ef0a1b4c11930d834accc34..1d70310d2fc6fefd0081078012dafbbb5b2da590 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -93,7 +93,7 @@ if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR != "notcmalloc"
     fi
 
     cd $WORKSPACE/ceph-container
-    sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh
+    sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} OSD_FLAVOR=${FLAVOR} /bin/bash ./contrib/build-push-ceph-container-imgs.sh
     cd $WORKSPACE
     sudo rm -rf ceph-container
 fi

diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index ee59915556b4c763a80d0ce5f911304dc0b57602..c59a621f7110809a0b6cc9a7b538eb19def807b6 100644 (file)
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -95,7 +95,7 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $FLAVOR != "notcmalloc"
     fi
 
     cd $WORKSPACE/ceph-container
-    sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh
+    sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} OSD_FLAVOR=${FLAVOR} /bin/bash ./contrib/build-push-ceph-container-imgs.sh
     cd $WORKSPACE
     sudo rm -rf ceph-container
 fi