From e61da13a00b5c5be6f57aee5c9c0017ce5c806aa Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 4 Jan 2017 09:37:25 -0600 Subject: [PATCH] ceph-deploy-build: do not use python to detect the distro We're using pbuilder in many build jobs now so we can't depend on the host to be the actual distro version that the binaries are being built for. This uses the value from the JJB matrix to determine what distro value to use when posting to chacra. Signed-off-by: Andrew Schoen --- ceph-deploy-build/build/build | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ceph-deploy-build/build/build b/ceph-deploy-build/build/build index c072e530..a4869655 100644 --- a/ceph-deploy-build/build/build +++ b/ceph-deploy-build/build/build @@ -83,7 +83,15 @@ then DEB_BUILD=$(lsb_release -s -c) #XXX only releases until we fix this RELEASE=1 - DISTRO=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"` + DISTRO="" + case $DIST in + jessie|wheezy) + DISTRO="debian" + ;; + *) + DISTRO="ubuntu" + ;; + esac [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" # ceph-deploy isn't architecture dependant, so we use 'all' as architecture and -- 2.39.5