jcapik pushed to kubernetes (f20). "Bump to upstream b5a91bda103ed2459f933959241a2b57331747ba (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Jun 10 14:45:02 UTC 2015


From 20438b2ee728696008dc7ebb947cdaae4c2deaf3 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 3 Jun 2015 09:37:34 +0200
Subject: Bump to upstream b5a91bda103ed2459f933959241a2b57331747ba Don't run
 %check section (kept only for local run). Tests are now handled via CI. -
 related: #1211266


diff --git a/.gitignore b/.gitignore
index ef95cd5..0caa9b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-5520386.tar.gz
+/kubernetes-b5a91bd.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 19b142f..3ad5b9b 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -10,7 +10,7 @@
 %global repo		kubernetes
 # https://github.com/GoogleCloudPlatform/kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		5520386b180d3ddc4fa7b7dfe6f52642cc0c25f3
+%global commit		b5a91bda103ed2459f933959241a2b57331747ba
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -20,7 +20,7 @@
 
 Name:		kubernetes
 Version:	0.18.0
-Release:	0.2.git%{shortcommit}%{?dist}
+Release:	0.3.git%{shortcommit}%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -205,6 +205,7 @@ Provides: golang(%{import_path}/pkg/util/httpstream) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/httpstream/spdy) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/iptables) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/mount) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/node) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/proxy) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/slice) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/strategicpatch) = %{version}-%{release}
@@ -336,7 +337,7 @@ Kubernetes services for node host
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.18.0-157-g5520386b180d3d
+export KUBE_GIT_VERSION=v0.18.0-273-gb5a91bda103ed2
 
 hack/build-go.sh --use_go_build
 hack/build-go.sh --use_go_build cmd/kube-version-change
@@ -393,9 +394,8 @@ for d in _output Godeps api cmd docs examples hack pkg plugin third_party test;
 done
 
 %check
-# RHEL7 and CentOS are tested via unit-test subpackage
-%if 0%{?fedora}
-
+# Fedora, RHEL7 and CentOS are tested via unit-test subpackage
+if [ 1 != 1 ]; then
 echo "******Testing the commands*****"
 hack/test-cmd.sh
 echo "******Benchmarking kube********"
@@ -408,7 +408,7 @@ hack/test-go.sh
 echo "******Testing integration******"
 #hack/test-integration.sh --use_go_build
 %endif
-%endif
+fi
 
 %files
 # empty as it depends on master and node
@@ -496,6 +496,11 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Wed Jun 03 2015 jchaloup <jchaloup at redhat.com> - 0.18.0-0.3.gitb5a91bd
+- Bump to upstream b5a91bda103ed2459f933959241a2b57331747ba
+- Don't run %check section (kept only for local run). Tests are now handled via CI.
+  related: #1211266
+
 * Tue Jun 02 2015 jchaloup <jchaloup at redhat.com> - 0.18.0-0.2.git5520386
 - Bump to upstream 5520386b180d3ddc4fa7b7dfe6f52642cc0c25f3
   related: #1211266
diff --git a/sources b/sources
index 2b8d8ba..4d9acad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb53c59788841295c009edf4e5f3497d  kubernetes-5520386.tar.gz
+da62ed9c8fa0a7e73a44dcf304cacfae  kubernetes-b5a91bd.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f20&id=20438b2ee728696008dc7ebb947cdaae4c2deaf3


More information about the scm-commits mailing list