From eb2b688918c9d5cc158feda6030c83a91106c1c8 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 18 Nov 2016 11:22:56 -0600 Subject: [PATCH] kernel: upload binaries to a dev chacra instance The chacra instances are now configured to always keep a build for the 'testing' ref, so it should be safe to store these in the dev chacra instances now. Signed-off-by: Andrew Schoen --- kernel/build/build_deb | 2 +- kernel/build/build_rpm | 2 +- kernel/build/setup | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/build/build_deb b/kernel/build/build_deb index 8bb1cce2..c9a0641a 100644 --- a/kernel/build/build_deb +++ b/kernel/build/build_deb @@ -112,7 +112,7 @@ 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_endpoint}/extra/ + curl -X POST -H "Content-Type:application/json" --data "@$WORKSPACE/repo-extra.json" -u $CHACRACTL_USER:$CHACRACTL_KEY ${chacra_url}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 4eee5052..2f8df569 100644 --- a/kernel/build/build_rpm +++ b/kernel/build/build_rpm @@ -97,7 +97,7 @@ 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_endpoint}/extra/ + curl -X POST -H "Content-Type:application/json" --data "@$WORKSPACE/repo-extra.json" -u $CHACRACTL_USER:$CHACRACTL_KEY ${chacra_url}repos/${chacra_endpoint}/extra/ # start repo creation $VENV/chacractl repo update ${chacra_endpoint} diff --git a/kernel/build/setup b/kernel/build/setup index cb14cd2c..f668910a 100644 --- a/kernel/build/setup +++ b/kernel/build/setup @@ -56,7 +56,9 @@ esac pkgs=( "chacractl>=0.0.4" ) install_python_packages "pkgs[@]" -make_chacractl_config +# ask shaman which chacra instance to use +chacra_url=`curl -u $SHAMAN_API_USER:$SHAMAN_API_KEY https://shaman.ceph.com/api/nodes/next/` +make_chacractl_config $chacra_url # Make sure we execute at the top level directory cd "$WORKSPACE" -- 2.47.3