From 04c43395c0e458db827ca814c352dedcc0c89d38 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 2 Dec 2020 17:07:41 +0800 Subject: [PATCH] ceph-build: define chacra_url in 'setup_deb' and use this variable in build_deb. this change pave the road to a consolidated build_deb file which can be shared by all ceph*-build jobs Signed-off-by: Kefu Chai --- ceph-build/build/build_deb | 4 +++- ceph-build/build/setup_deb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb index 006fe3ec..558a0956 100644 --- a/ceph-build/build/build_deb +++ b/ceph-build/build/build_deb @@ -98,9 +98,11 @@ if [ "$THROWAWAY" = false ] ; then } EOF # post the json to repo-extra json to chacra - curl -X POST -H "Content-Type:application/json" --data "@$WORKSPACE/repo-extra.json" -u $CHACRACTL_USER:$CHACRACTL_KEY https://chacra.ceph.com/repos/${chacra_repo_endpoint}/extra/ + curl -X POST -H "Content-Type:application/json" --data "@$WORKSPACE/repo-extra.json" -u $CHACRACTL_USER:$CHACRACTL_KEY ${chacra_url}repos/${chacra_repo_endpoint}/extra/ # start repo creation $VENV/chacractl repo update ${chacra_repo_endpoint} + + echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_repo_endpoint}/ fi # update shaman with the completed build status diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 5405b48a..7cc04168 100644 --- a/ceph-build/build/setup_deb +++ b/ceph-build/build/setup_deb @@ -107,6 +107,7 @@ create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORM pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" +chacra_url=https://chacra.ceph.com/ make_chacractl_config FLAVOR="default" -- 2.39.5