From baf59f50b16e1f96f5dab66f1538d845357f48e9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 16 Jul 2020 17:06:27 +0800 Subject: [PATCH] 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 --- ceph-dev-build/build/build_rpm | 2 +- ceph-dev-new-build/build/build_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 7b390c93..1d70310d 100644 --- 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 ee599155..c59a621f 100644 --- 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 -- 2.39.5