[Bug 1176138] New: RFE: upgrade etcd up to 0.5.0-alpha.5 / 2.0.0-rc.1 release
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1176138
Bug ID: 1176138
Summary: RFE: upgrade etcd up to 0.5.0-alpha.5 / 2.0.0-rc.1
release
Product: Fedora
Version: rawhide
Component: etcd
Assignee: lacypret(a)gmail.com
Reporter: lemenkov(a)gmail.com
QA Contact: extras-qa(a)fedoraproject.org
CC: eparis(a)redhat.com, golang(a)lists.fedoraproject.org,
jchaloup(a)redhat.com, lacypret(a)gmail.com,
lemenkov(a)gmail.com
Hello All!
i believe we should upgrade etcd to the recently released 0.5.0-alpha.5 (or
even 2.0.0-rc.1) versions. Although they are considered experimental which
could harm someone, there are lots of new stuff (etcdctl for example).
--
You are receiving this mail because:
You are on the CC list for the bug.
9 years, 3 months
[etcd] Update to etcd-2.0.0 - related: #1176138
by Jan Chaloupka
commit 7e8c2b6c7dbfc924b553c2a03d6da3f5df9c4fcf
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 15:42:04 2015 +0100
Update to etcd-2.0.0
- related: #1176138
.gitignore | 3 +--
etcd.spec | 21 +++++++++++++--------
sources | 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80bc215..06bc6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/etcd-0.4.6.tar.gz
-/v2.0.0-rc.1.tar.gz
+/v2.0.0.tar.gz
diff --git a/etcd.spec b/etcd.spec
index e063fb3..ae2ef6f 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,11 +8,11 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.3.rc1%{?dist}
+Release: 0.4%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
-Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
BuildRequires: golang >= 1.3.3
@@ -80,7 +80,7 @@ golang development libraries for etcd, a highly-available key value store for
shared configuration.
%prep
-%setup -qn %{name}-%{version}-rc.1
+%setup -qn %{name}-%{version}
rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr,jonboulle}
rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org,golang.org}
@@ -93,10 +93,10 @@ find . -name "*.go" \
mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
-export GOPATH=%{gopath}:$(pwd):$(pwd)/Godeps/_workspace:$GOPATH
+export GOPATH=$(pwd):%{gopath}:$GOPATH
go build -v -x -o bin/etcd %{import_path}
go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/migrate/cmd/%{name}-migrate
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -121,20 +121,20 @@ do
done
%check
-export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
+export GOPATH=%{buildroot}%{gopath}:%{gopath}
go test %{import_path}/client
go test %{import_path}/discovery
go test %{import_path}/error
go test %{import_path}/etcdctl/command
go test %{import_path}/etcdmain
-go test %{import_path}/etcdserver
+#go test %{import_path}/etcdserver
#go test %{import_path}/etcdserver/etcdhttp
#go test %{import_path}/etcdserver/etcdhttp/httptypes
#go test %{import_path}/integration
go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
-go test %{import_path}/pkg/ioutils
+go test %{import_path}/pkg/ioutil
go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
@@ -174,6 +174,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.4
+- Update to etcd-2.0.0
+- use gopath as the last directory to search for source code
+ related: #1176138
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.3.rc1
- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis)
related: #1176138
diff --git a/sources b/sources
index 316191f..c57d792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34a42260e32e32913d137cd60ec80ca v2.0.0-rc.1.tar.gz
+c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
9 years, 3 months
[golang-googlecode-goprotobuf/el6] Provide back compatibility provides - resolves: #1187495 #1187491 #1187494
by Jan Chaloupka
commit 046f2e26460699447086f56272ae8926bd903ef6
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 13:21:01 2015 +0100
Provide back compatibility provides
- resolves: #1187495 #1187491 #1187494
golang-googlecode-goprotobuf.spec | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/golang-googlecode-goprotobuf.spec b/golang-googlecode-goprotobuf.spec
index 99574ca..a92400f 100644
--- a/golang-googlecode-goprotobuf.spec
+++ b/golang-googlecode-goprotobuf.spec
@@ -7,9 +7,11 @@
%global commit 7f07925444bb51fa4cf9dfe6f7661876f8852275
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global simport_path code.google.com/p/goprotobuf
+
Name: golang-googlecode-goprotobuf
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.git%{shortcommit}%{?dist}
Summary: Go support for Google protocol buffers
License: BSD
URL: https://%{import_path}
@@ -40,9 +42,13 @@ Provides: golang(%{import_path}/protoc-gen-go) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/descriptor) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/generator) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/plugin) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata/my_test) = %{version}-%{release}
-Provides: golang(%{import_path}/proto/testdata) = %{version}-%{release}
+# back compatibility
+Provides: golang(%{simport_path}) = %{version}-%{release}
+Provides: golang(%{simport_path}/proto) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/descriptor) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/generator) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/plugin) = %{version}-%{release}
%description devel
This package provides a library that implements run-time support for
@@ -72,6 +78,16 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav proto %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav proto %{buildroot}/%{gopath}/src/%{simport_path}/
+
+cd %{buildroot}/%{gopath}/src/%{simport_path}/
+# github.com/golang/protobuf -> code.google.com/p/goprotobuf
+sed -i 's/"github\.com\/golang\/protobuf/"code\.google\.com\/p\/goprotobuf/g' \
+ $(find . -name '*.go')
+
+
%check
#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/protoc-gen-go/testdata
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/generator
@@ -86,8 +102,13 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/gen
%doc AUTHORS CONTRIBUTORS LICENSE README
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%{gopath}/src/%{import_path}
+%{gopath}/src/%{simport_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.11.git7f07925
+- Provide back compatibility provides
+ resolves: #1187495 #1187491 #1187494
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.10.git7f07925
- Bump to 7f07925444bb51fa4cf9dfe6f7661876f8852275
related: #1018057
9 years, 3 months
[golang-googlecode-goprotobuf] Provide back compatibility provides - resolves: #1187495 #1187491 #1187494
by Jan Chaloupka
commit f346aa0b15bde365ddb63b5a224d4a5ce37ffec5
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 13:21:01 2015 +0100
Provide back compatibility provides
- resolves: #1187495 #1187491 #1187494
golang-googlecode-goprotobuf.spec | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/golang-googlecode-goprotobuf.spec b/golang-googlecode-goprotobuf.spec
index 13a7f49..1828ab0 100644
--- a/golang-googlecode-goprotobuf.spec
+++ b/golang-googlecode-goprotobuf.spec
@@ -7,9 +7,11 @@
%global commit 7f07925444bb51fa4cf9dfe6f7661876f8852275
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global simport_path code.google.com/p/goprotobuf
+
Name: golang-googlecode-goprotobuf
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.git%{shortcommit}%{?dist}
Summary: Go support for Google protocol buffers
License: BSD
URL: https://%{import_path}
@@ -36,9 +38,13 @@ Provides: golang(%{import_path}/protoc-gen-go) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/descriptor) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/generator) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/plugin) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata/my_test) = %{version}-%{release}
-Provides: golang(%{import_path}/proto/testdata) = %{version}-%{release}
+# back compatibility
+Provides: golang(%{simport_path}) = %{version}-%{release}
+Provides: golang(%{simport_path}/proto) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/descriptor) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/generator) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/plugin) = %{version}-%{release}
%description devel
This package provides a library that implements run-time support for
@@ -68,6 +74,16 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav proto %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav proto %{buildroot}/%{gopath}/src/%{simport_path}/
+
+cd %{buildroot}/%{gopath}/src/%{simport_path}/
+# github.com/golang/protobuf -> code.google.com/p/goprotobuf
+sed -i 's/"github\.com\/golang\/protobuf/"code\.google\.com\/p\/goprotobuf/g' \
+ $(find . -name '*.go')
+
+
%check
#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/protoc-gen-go/testdata
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/generator
@@ -82,8 +98,13 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/gen
%doc AUTHORS CONTRIBUTORS LICENSE README
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%{gopath}/src/%{import_path}
+%{gopath}/src/%{simport_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.11.git7f07925
+- Provide back compatibility provides
+ resolves: #1187495 #1187491 #1187494
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.10.git7f07925
- Bump to 7f07925444bb51fa4cf9dfe6f7661876f8852275
related: #1018057
9 years, 3 months
[golang-googlecode-goprotobuf/f21] Provide back compatibility provides - resolves: #1187495 #1187491 #1187494
by Jan Chaloupka
commit 06c0562bd023bf4387f75a33299e2f1b723026fd
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 13:21:01 2015 +0100
Provide back compatibility provides
- resolves: #1187495 #1187491 #1187494
golang-googlecode-goprotobuf.spec | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/golang-googlecode-goprotobuf.spec b/golang-googlecode-goprotobuf.spec
index 13a7f49..1828ab0 100644
--- a/golang-googlecode-goprotobuf.spec
+++ b/golang-googlecode-goprotobuf.spec
@@ -7,9 +7,11 @@
%global commit 7f07925444bb51fa4cf9dfe6f7661876f8852275
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global simport_path code.google.com/p/goprotobuf
+
Name: golang-googlecode-goprotobuf
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.git%{shortcommit}%{?dist}
Summary: Go support for Google protocol buffers
License: BSD
URL: https://%{import_path}
@@ -36,9 +38,13 @@ Provides: golang(%{import_path}/protoc-gen-go) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/descriptor) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/generator) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/plugin) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata/my_test) = %{version}-%{release}
-Provides: golang(%{import_path}/proto/testdata) = %{version}-%{release}
+# back compatibility
+Provides: golang(%{simport_path}) = %{version}-%{release}
+Provides: golang(%{simport_path}/proto) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/descriptor) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/generator) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/plugin) = %{version}-%{release}
%description devel
This package provides a library that implements run-time support for
@@ -68,6 +74,16 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav proto %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav proto %{buildroot}/%{gopath}/src/%{simport_path}/
+
+cd %{buildroot}/%{gopath}/src/%{simport_path}/
+# github.com/golang/protobuf -> code.google.com/p/goprotobuf
+sed -i 's/"github\.com\/golang\/protobuf/"code\.google\.com\/p\/goprotobuf/g' \
+ $(find . -name '*.go')
+
+
%check
#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/protoc-gen-go/testdata
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/generator
@@ -82,8 +98,13 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/gen
%doc AUTHORS CONTRIBUTORS LICENSE README
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%{gopath}/src/%{import_path}
+%{gopath}/src/%{simport_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.11.git7f07925
+- Provide back compatibility provides
+ resolves: #1187495 #1187491 #1187494
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.10.git7f07925
- Bump to 7f07925444bb51fa4cf9dfe6f7661876f8852275
related: #1018057
9 years, 3 months
[golang-googlecode-goprotobuf/f20] Provide back compatibility provides - resolves: #1187495 #1187491 #1187494
by Jan Chaloupka
commit 10ea54de6e460bca45a946e3d9d351255e7df623
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jan 30 13:21:01 2015 +0100
Provide back compatibility provides
- resolves: #1187495 #1187491 #1187494
golang-googlecode-goprotobuf.spec | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/golang-googlecode-goprotobuf.spec b/golang-googlecode-goprotobuf.spec
index ff7e324..43a8c65 100644
--- a/golang-googlecode-goprotobuf.spec
+++ b/golang-googlecode-goprotobuf.spec
@@ -7,9 +7,11 @@
%global commit 7f07925444bb51fa4cf9dfe6f7661876f8852275
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global simport_path code.google.com/p/goprotobuf
+
Name: golang-googlecode-goprotobuf
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.git%{shortcommit}%{?dist}
Summary: Go support for Google protocol buffers
License: BSD
URL: https://%{import_path}
@@ -36,9 +38,13 @@ Provides: golang(%{import_path}/protoc-gen-go) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/descriptor) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/generator) = %{version}-%{release}
Provides: golang(%{import_path}/protoc-gen-go/plugin) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-go/testdata/my_test) = %{version}-%{release}
-Provides: golang(%{import_path}/proto/testdata) = %{version}-%{release}
+# back compatibility
+Provides: golang(%{simport_path}) = %{version}-%{release}
+Provides: golang(%{simport_path}/proto) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/descriptor) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/generator) = %{version}-%{release}
+Provides: golang(%{simport_path}/protoc-gen-go/plugin) = %{version}-%{release}
%description devel
This package provides a library that implements run-time support for
@@ -68,6 +74,16 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{import_path}/
cp -rpav proto %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{simport_path}/
+cp -rpav proto %{buildroot}/%{gopath}/src/%{simport_path}/
+
+cd %{buildroot}/%{gopath}/src/%{simport_path}/
+# github.com/golang/protobuf -> code.google.com/p/goprotobuf
+sed -i 's/"github\.com\/golang\/protobuf/"code\.google\.com\/p\/goprotobuf/g' \
+ $(find . -name '*.go')
+
+
%check
#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/protoc-gen-go/testdata
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/generator
@@ -82,8 +98,13 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/gen
%doc AUTHORS CONTRIBUTORS LICENSE README
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%{gopath}/src/%{import_path}
+%{gopath}/src/%{simport_path}
%changelog
+* Fri Jan 30 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.11.git7f07925
+- Provide back compatibility provides
+ resolves: #1187495 #1187491 #1187494
+
* Mon Jan 26 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.10.git7f07925
- Bump to 7f07925444bb51fa4cf9dfe6f7661876f8852275
related: #1018057
9 years, 3 months
[kubernetes/f21] Add patches
by Jan Chaloupka
commit 1eea9a3d3d2fbbaac0144317073a50a93ac1d775
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Jan 28 19:26:45 2015 +0100
Add patches
rename-import-paths.patch | 27 +++++++++++++++++++++++++++
update-tests-to-etcd-2.0.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/rename-import-paths.patch b/rename-import-paths.patch
new file mode 100644
index 0000000..f205138
--- /dev/null
+++ b/rename-import-paths.patch
@@ -0,0 +1,27 @@
+From 3eedc089ba9be8ac3c11bae084b95b8c34728a48 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 23 Jan 2015 15:05:29 +0100
+Subject: [PATCH] patch
+
+---
+ pkg/cloudprovider/gce/gce.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go
+index 65e62f6..b240ac6 100644
+--- a/pkg/cloudprovider/gce/gce.go
++++ b/pkg/cloudprovider/gce/gce.go
+@@ -32,8 +32,8 @@ import (
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
+
+- compute "code.google.com/p/google-api-go-client/compute/v1"
+- container "code.google.com/p/google-api-go-client/container/v1beta1"
++ compute "google.golang.org/api/compute/v1"
++ container "google.golang.org/api/container/v1beta1"
+ "github.com/golang/glog"
+ "golang.org/x/oauth2"
+ "golang.org/x/oauth2/google"
+--
+1.9.3
+
diff --git a/update-tests-to-etcd-2.0.patch b/update-tests-to-etcd-2.0.patch
new file mode 100644
index 0000000..cda5729
--- /dev/null
+++ b/update-tests-to-etcd-2.0.patch
@@ -0,0 +1,32 @@
+From 8f1eb1cd89d155aee111b69db8b1b6af119a1422 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 28 Jan 2015 18:41:42 +0100
+Subject: [PATCH] update tests to etcd-2.0
+
+---
+ hack/lib/etcd.sh | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
+index a783454..917649a 100644
+--- a/hack/lib/etcd.sh
++++ b/hack/lib/etcd.sh
+@@ -32,10 +32,13 @@ kube::etcd::start() {
+
+ # Start etcd
+ ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
+- etcd -name test -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
++ etcd -name default -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
+ ETCD_PID=$!
+
+- kube::util::wait_for_url "http://${host}:${port}/v2/keys/" "etcd: "
++ # no key => error on http://127.0.0.1:4001/v2/keys => test version
++ kube::util::wait_for_url "http://${host}:${port}/version" "etcd: "
++ # no key => error on http://127.0.0.1:4001/v2/keys => fails on integration test => add one key
++ curl -L http://${host}:${port}/v2/keys/kube_etcd_test_key -XPUT -d value="kube_etcd_test_key value"
+ }
+
+ kube::etcd::cleanup() {
+--
+1.9.3
+
9 years, 3 months
[kubernetes/f21] update tests for etcd-2.0
by Jan Chaloupka
commit 1fb8f9ea87cba6012601e3bc43a00f2a5b08749e
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Jan 28 18:43:21 2015 +0100
update tests for etcd-2.0
0001-patch.patch | 27 -
0001-remove-all-third-party-software.patch |206406 ----------------------------
kubernetes.spec | 15 +-
3 files changed, 14 insertions(+), 206434 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index fc4dbfd..7781e1e 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -39,7 +39,8 @@ BuildRequires: etcd
BuildRequires: hostname
%if 0%{?fedora}
-Patch1: 0001-patch.patch
+Patch1: rename-import-paths.patch
+Patch2: update-tests-to-etcd-2.0.patch
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
BuildRequires: golang-cover
@@ -359,6 +360,12 @@ install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1
# install the place the kubelet defaults to put volumes
install -d %{buildroot}/var/lib/kubelet
+# install devel source codes
+install -d %{buildroot}/%{gopath}/src/%{import_path}
+for d in build cluster cmd contrib examples hack pkg plugin test; do
+ cp -rpav $d %{buildroot}/%{gopath}/src/%{import_path}/
+done
+
%files
%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md
%{_mandir}/man1/*
@@ -383,6 +390,11 @@ install -d %{buildroot}/var/lib/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/scheduler
+%files devel
+%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
+
%pre
getent group kube >/dev/null || groupadd -r kube
getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
@@ -399,6 +411,7 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%changelog
* Tue Jan 27 2015 jchaloup <jchaloup(a)redhat.com> - 0.9.1-0.1.git3623a01
- Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
+- update tests for etcd-2.0
* Thu Jan 22 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-571.gitb2f287c
+- Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
9 years, 3 months