commit containerd-kubic for openSUSE:Factory

2018-06-05 Thread root
Hello community,

here is the log from the commit of package containerd-kubic for 
openSUSE:Factory checked in at 2018-06-05 12:56:47

Comparing /work/SRC/openSUSE:Factory/containerd-kubic (Old)
 and  /work/SRC/openSUSE:Factory/.containerd-kubic.new (New)


Package is "containerd-kubic"

Tue Jun  5 12:56:47 2018 rev:5 rq:614187 version:0.2.9+gitr706_06b9cb351610

Changes:

--- /work/SRC/openSUSE:Factory/containerd-kubic/containerd-kubic.changes
2018-05-16 18:44:56.272042557 +0200
+++ /work/SRC/openSUSE:Factory/.containerd-kubic.new/containerd-kubic.changes   
2018-06-05 12:56:48.377078731 +0200
@@ -1,0 +2,17 @@
+Tue Jun  5 08:24:33 UTC 2018 - dcass...@suse.com
+
+- Refactor %license usage to a simpler form
+
+---
+Tue Jun  5 06:38:40 UTC 2018 - asa...@suse.com
+
+- Remove 'go test' from %check section, as it has only ever caused us problems
+  and hasn't (as far as I remember) ever caught a release-blocking issue. Smoke
+  testing has been far more useful. boo#1095817
+
+---
+Mon Jun  4 14:15:28 UTC 2018 - dcass...@suse.com
+
+- Make use of %license macro
+
+---



Other differences:
--
++ containerd-kubic.spec ++
--- /var/tmp/diff_new_pack.SO9ZKw/_old  2018-06-05 12:56:49.001055875 +0200
+++ /var/tmp/diff_new_pack.SO9ZKw/_new  2018-06-05 12:56:49.005055729 +0200
@@ -128,12 +128,11 @@
 cp $PROJECT/bin/containerd-shim containerd-shim-%{version}
 
 %check
-export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH
-cd $HOME/go/src/github.com/containerd/containerd
-%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \
-   grepgithub.com/containerd/containerd | \
-   grep -v github.com/containerd/containerd/vendor | \
-   grep -v /integration-test)
+# We used to run 'go test' here, however we found that this actually didn't
+# catch any issues that were caught by smoke testing, and %check would
+# continually cause package builds to fail due to flaky tests. If you ever need
+# to know how the testing was done, you can always look in the package history.
+# boo#1095817
 
 %install
 install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd
@@ -168,13 +167,14 @@
 
 %files
 %defattr(-,root,root)
-%doc LICENSE.code LICENSE.docs README.md
+%doc README.md
 %{_sbindir}/containerd
 %{_sbindir}/containerd-shim
 %{_unitdir}/%{realname}.service
 %{_unitdir}/%{realname}.socket
 %{_fillupdir}/sysconfig.%{realname}
 %{_sbindir}/rccontainerd
+%license LICENSE.code LICENSE.docs
 
 %files ctr
 %{_sbindir}/%{realname}-ctr




commit containerd-kubic for openSUSE:Factory

2018-05-16 Thread root
Hello community,

here is the log from the commit of package containerd-kubic for 
openSUSE:Factory checked in at 2018-05-16 18:43:37

Comparing /work/SRC/openSUSE:Factory/containerd-kubic (Old)
 and  /work/SRC/openSUSE:Factory/.containerd-kubic.new (New)


Package is "containerd-kubic"

Wed May 16 18:43:37 2018 rev:4 rq:609107 version:0.2.9+gitr706_06b9cb351610

Changes:

--- /work/SRC/openSUSE:Factory/containerd-kubic/containerd-kubic.changes
2018-04-13 12:51:42.655333656 +0200
+++ /work/SRC/openSUSE:Factory/.containerd-kubic.new/containerd-kubic.changes   
2018-05-16 18:44:56.272042557 +0200
@@ -1,0 +2,5 @@
+Wed May 16 10:10:10 UTC 2018 - jmassaguer...@suse.com
+
+- Review obsoletes tag to fix bsc#1080978 
+
+---



Other differences:
--
++ containerd-kubic.spec ++
--- /var/tmp/diff_new_pack.UCPGgq/_old  2018-05-16 18:44:57.29022 +0200
+++ /var/tmp/diff_new_pack.UCPGgq/_new  2018-05-16 18:44:57.204008877 +0200
@@ -61,6 +61,7 @@
 # We provide a git revision so that Docker can require it properly.
 Provides:   %{name}-git = %{git_version}
 # Obsolete older package without -kubic suffix: v2 -> v3
+Obsoletes:  containerd = 0.2.5+gitr569_2a5e70c
 Obsoletes:  containerd_2a5e70c
 # Conflict with non-kubic package, and provide equivalent
 Conflicts:  containerd > 0.2.5+gitr569_2a5e70c




commit containerd-kubic for openSUSE:Factory

2018-04-13 Thread root
Hello community,

here is the log from the commit of package containerd-kubic for 
openSUSE:Factory checked in at 2018-04-13 12:51:12

Comparing /work/SRC/openSUSE:Factory/containerd-kubic (Old)
 and  /work/SRC/openSUSE:Factory/.containerd-kubic.new (New)


Package is "containerd-kubic"

Fri Apr 13 12:51:12 2018 rev:3 rq:595979 version:0.2.9+gitr706_06b9cb351610

Changes:

--- /work/SRC/openSUSE:Factory/containerd-kubic/containerd-kubic.changes
2018-02-12 14:46:12.680547292 +0100
+++ /work/SRC/openSUSE:Factory/.containerd-kubic.new/containerd-kubic.changes   
2018-04-13 12:51:42.655333656 +0200
@@ -1,0 +2,7 @@
+Thu Apr 12 12:48:16 UTC 2018 - fcaste...@suse.com
+
+- Put containerd under the podruntime slice. This the recommended
+  deployment to allow fine resource control on Kubernetes.
+  bsc#1086185
+
+---



Other differences:
--
++ containerd.service ++
--- /var/tmp/diff_new_pack.YMgN0w/_old  2018-04-13 12:51:43.391306991 +0200
+++ /var/tmp/diff_new_pack.YMgN0w/_new  2018-04-13 12:51:43.391306991 +0200
@@ -19,6 +19,10 @@
 # infinity so that containers don't randomly fail to spawn.
 TasksMax=infinity
 
+# Place containerd under the podruntime slice, this is part of the recommended
+# deployment to allow fine resource control on Kubernetes
+Slice=podruntime.slice
+
 [Install]
 WantedBy=multi-user.target
 




commit containerd-kubic for openSUSE:Factory

2018-02-12 Thread root
Hello community,

here is the log from the commit of package containerd-kubic for 
openSUSE:Factory checked in at 2018-02-12 14:46:11

Comparing /work/SRC/openSUSE:Factory/containerd-kubic (Old)
 and  /work/SRC/openSUSE:Factory/.containerd-kubic.new (New)


Package is "containerd-kubic"

Mon Feb 12 14:46:11 2018 rev:2 rq:575609 version:0.2.9+gitr706_06b9cb351610

Changes:

--- /work/SRC/openSUSE:Factory/containerd-kubic/containerd-kubic.changes
2018-02-01 21:28:27.979660533 +0100
+++ /work/SRC/openSUSE:Factory/.containerd-kubic.new/containerd-kubic.changes   
2018-02-12 14:46:12.680547292 +0100
@@ -1,0 +2,10 @@
+Mon Feb 12 10:52:49 UTC 2018 - rbr...@suse.com
+
+- Add ${version} to equivalent non-kubic package provides
+
+---
+Thu Feb  8 12:34:13 UTC 2018 - rbr...@suse.com
+
+- Add Provides for equivalent non-kubic packages
+
+---



Other differences:
--
++ containerd-kubic.spec ++
--- /var/tmp/diff_new_pack.9HuP99/_old  2018-02-12 14:46:13.756508503 +0100
+++ /var/tmp/diff_new_pack.9HuP99/_new  2018-02-12 14:46:13.756508503 +0100
@@ -62,8 +62,9 @@
 Provides:   %{name}-git = %{git_version}
 # Obsolete older package without -kubic suffix: v2 -> v3
 Obsoletes:  containerd_2a5e70c
-# Conflict with non-kubic package
+# Conflict with non-kubic package, and provide equivalent
 Conflicts:  containerd > 0.2.5+gitr569_2a5e70c
+Provides:   containerd = %{version}
 # Currently runC is the only supported runtime for containerd. We match the
 # same version as the one pinned by Docker.
 Requires:   docker-runc-kubic-git = %{required_dockerrunc}
@@ -83,8 +84,9 @@
 BuildRequires:  golang(API) = 1.8
 # Obsolete older package without -kubic suffix: v2 -> v3
 Obsoletes:  containerd-ctr = 0.2.5+gitr569_2a5e70c
-# Conflict with non-kubic package
+# Conflict with non-kubic package, and provide equivalent
 Conflicts:  containerd-ctr > 0.2.5+gitr569_2a5e70c
+Provides:   containerd-ctr = %{version}
 
 %description ctr
 Standalone client for containerd, which allows management of containerd 
containers
@@ -97,8 +99,9 @@
 BuildArch:  noarch
 # Obsolete older package without -kubic suffix: v2 -> v3
 Obsoletes:  containerd-test = 0.2.5+gitr569_2a5e70c
-# Conflict with non-kubic package
+# Conflict with non-kubic package, and provide equivalent
 Conflicts:  containerd-test > 0.2.5+gitr569_2a5e70c
+Provides:   containerd-test = %{version}
 
 %description test
 Test package for containerd. It contains the source code and the tests.