]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-deploy-build: do not use python to detect the distro 606/head
authorAndrew Schoen <aschoen@redhat.com>
Wed, 4 Jan 2017 15:37:25 +0000 (09:37 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 4 Jan 2017 15:37:25 +0000 (09:37 -0600)
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 <aschoen@redhat.com>
ceph-deploy-build/build/build

index c072e530950ea6258812371385e8570ea131427e..a4869655921034c4b3f56217c3a15f08cd69ac33 100644 (file)
@@ -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