From 2afc1dc5942c5fe2bf0ee8d4abc069fe7563f604 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 29 Aug 2016 14:51:54 -0500 Subject: [PATCH] ceph-dev-build: post repo build info to chacra Signed-off-by: Andrew Schoen --- ceph-dev-build/build/build_deb | 12 ++++++++++++ ceph-dev-build/build/build_rpm | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ceph-dev-build/build/build_deb b/ceph-dev-build/build/build_deb index ccaa2d86..3234d11e 100644 --- a/ceph-dev-build/build/build_deb +++ b/ceph-dev-build/build/build_deb @@ -185,6 +185,18 @@ echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint} + # write json file with build info + cat > $WORKSPACE/repo-extra.json << EOF +{ + "version":"$vers", + "build_url":"$BUILD_URL", + "root_build_cause":"$ROOT_BUILD_CAUSE", + "node_name":"$NODE_NAME", + "job_name":"$JOB_NAME", +} +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 ${chacra_url}${chacra_repo_endpoint}/extra/ # start repo creation $VENV/chacractl repo update ${chacra_repo_endpoint} diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index b7dea9ed..325bdad1 100644 --- a/ceph-dev-build/build/build_rpm +++ b/ceph-dev-build/build/build_rpm @@ -225,8 +225,21 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source/flavors/${FLAVOR} find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} + # write json file with build info + cat > $WORKSPACE/repo-extra.json << EOF +{ + "version":"$vers", + "build_url":"$BUILD_URL", + "root_build_cause":"$ROOT_BUILD_CAUSE", + "node_name":"$NODE_NAME", + "job_name":"$JOB_NAME", +} +EOF + chacra_repo_endpoint="${chacra_endpoint}/flavors/${FLAVOR}" + # 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 ${chacra_url}${chacra_repo_endpoint}/extra/ # start repo creation - $VENV/chacractl repo update ${chacra_endpoint}/flavors/${FLAVOR} + $VENV/chacractl repo update ${chacra_repo_endpoint} echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_endpoint}/flavors/${FLAVOR}/ fi -- 2.39.5