[docker-io/f21] run tests inside a docker repo (not built)

Lokesh Mandvekar lsm5 at fedoraproject.org
Fri Jan 16 06:01:09 UTC 2015


commit 98391719e4d9091858869d8dfc6d171e741b7c55
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Fri Jan 16 05:59:39 2015 +0000

    run tests inside a docker repo (not built)
    
    NVR: docker-io-1.4.1-6 (not built)
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

 docker-io.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ad091e0..5ab9091 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -17,7 +17,7 @@
 
 Name:       %{repo}-io
 Version:    1.4.1
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Automates deployment of containerized applications
 License:    ASL 2.0
 URL:        http://www.docker.com
@@ -322,7 +322,15 @@ cp -rpav vendor/src/%{tar_import_path}/* %{buildroot}%{gopath}/src/%{import_path
 install -dp %{buildroot}%{_sysconfdir}/%{repo}
 
 %check
-[ ! -e /run/docker.sock ] || make test
+[ ! -e /run/docker.sock ] || {
+    mkdir test_dir
+    pushd test_dir
+    git clone https://%{import_path}
+    pushd docker
+    make test-unit
+    popd
+    popd
+}
 
 %pre
 getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -382,6 +390,9 @@ exit 0
 %{_datadir}/zsh/site-functions/_docker
 
 %changelog
+* Fri Jan 16 2015 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.4.1-6
+- run tests inside a docker repo (doesn't affect koji builds - not built)
+
 * Tue Jan 13 2015 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.4.1-5
 - Resolves: rhbz#1169593 patch to set DOCKER_CERT_PATH regardless of config file
 


More information about the scm-commits mailing list