From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 10 Aug 2016 20:14:59 +0000 (-0500)
Subject: ceph-dev-build: add scripts to validate distro type
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9897a8789b627c5c174f2dc1464ab574095b9832;p=ceph-build.git

ceph-dev-build: add scripts to validate distro type

This will make sure a build script fails early if it will not work on
the distro being built for. Doing this early avoids duplicate calls to
the build_utils and setup scripts.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-dev-build/build/build_deb b/ceph-dev-build/build/build_deb
index bd49e5ab..239ca986 100644
--- a/ceph-dev-build/build/build_deb
+++ b/ceph-dev-build/build/build_deb
@@ -1,11 +1,6 @@
 #!/bin/bash
 set -ex
 
-# Only do actual work when we are a DEB distro
-if test -f /etc/redhat-release ; then
-    exit 0
-fi
-
 cd $WORKSPACE
 
 get_bptag() {
diff --git a/ceph-dev-build/build/validate_deb b/ceph-dev-build/build/validate_deb
new file mode 100644
index 00000000..0322b47a
--- /dev/null
+++ b/ceph-dev-build/build/validate_deb
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ex
+
+# Only do actual work when we are a DEB distro
+if test -f /etc/redhat-release ; then
+    exit 0
+fi
diff --git a/ceph-dev-build/build/validate_rpm b/ceph-dev-build/build/validate_rpm
new file mode 100644
index 00000000..17b41482
--- /dev/null
+++ b/ceph-dev-build/build/validate_rpm
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ex
+
+# only do work if we are a RPM distro
+if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
+    exit 0
+fi
diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 387edce6..02da4e0e 100644
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -53,6 +53,7 @@
       # debian build scripts
       - shell:
           !include-raw:
+            - ../../build/validate_deb
             - ../../../scripts/build_utils.sh
             - ../../build/setup
             - ../../build/setup_pbuilder
@@ -60,6 +61,7 @@
       # rpm build scripts
       - shell:
           !include-raw:
+            - ../../build/validate_rpm
             - ../../../scripts/build_utils.sh
             - ../../build/setup
             - ../../build/build_rpm