From 003ca0ebfa2b6e0119c64906fcff76bbcbb83908 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 15 Nov 2016 15:02:38 +0100 Subject: [PATCH] kernel: repo-extra json with kernelrelease Signed-off-by: Ilya Dryomov --- kernel/build/build_deb | 13 +++++++++++++ kernel/build/build_rpm | 13 +++++++++++++ kernel/build/prepare_config | 2 ++ 3 files changed, 28 insertions(+) diff --git a/kernel/build/build_deb b/kernel/build/build_deb index b30281e8..0d24b955 100644 --- a/kernel/build/build_deb +++ b/kernel/build/build_deb @@ -99,6 +99,19 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find ../*.deb | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/ + # write json file with build info + cat > $WORKSPACE/repo-extra.json << EOF +{ + "version":"$kernelrelease", + "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 https://chacra.ceph.com/repos/${chacra_endpoint}/extra/ + # start repo creation $VENV/chacractl repo update ${chacra_endpoint} diff --git a/kernel/build/build_rpm b/kernel/build/build_rpm index c502b3f5..0badf1a5 100644 --- a/kernel/build/build_rpm +++ b/kernel/build/build_rpm @@ -84,6 +84,19 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find ~/rpmbuild/ | egrep '\.rpm$' | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/$ARCH/ + # write json file with build info + cat > $WORKSPACE/repo-extra.json << EOF +{ + "version":"$kernelrelease", + "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 https://chacra.ceph.com/repos/${chacra_endpoint}/extra/ + # start repo creation $VENV/chacractl repo update ${chacra_endpoint} diff --git a/kernel/build/prepare_config b/kernel/build/prepare_config index d9ad7e22..a91f0986 100644 --- a/kernel/build/prepare_config +++ b/kernel/build/prepare_config @@ -16,3 +16,5 @@ if ! grep -q "^CONFIG_LOCALVERSION_AUTO=y" .config; then exit 1 fi printf -- '-ceph-g%s' ${GIT_COMMIT:0:12} > .scmversion + +kernelrelease=$(make -s kernelrelease) -- 2.39.5