Accepting request 703715 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/703715
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cni?expand=0&rev=6

build.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -e
+
+ORG_PATH="github.com/containernetworking"
+REPO_PATH="${ORG_PATH}/cni"
+
+if [ ! -h gopath/src/${REPO_PATH} ]; then
+	mkdir -p gopath/src/${ORG_PATH}
+	ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
+fi
+
+export GO15VENDOREXPERIMENT=1
+export GOPATH=${PWD}/gopath
+
+echo "Building API"
+go build "$@" ${REPO_PATH}/libcni
+
+echo "Building reference CLI"
+go build -o ${PWD}/bin/cnitool "$@" ${REPO_PATH}/cnitool
+
+echo "Building plugins"
+PLUGINS="plugins/test/*"
+for d in $PLUGINS; do
+	if [ -d $d ]; then
+		plugin=$(basename $d)
+		echo "  " $plugin
+		go build -o ${PWD}/bin/$plugin "$@" ${REPO_PATH}/$d
+	fi
+done

cni-0.6.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7ed2bbdd4057f33b220ced885311246b6ee6b006e6ed6e96c30f76a11b85c1e
-size 141940

cni-0.7.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e87074a2abdd3ba25c382882dfe69ff26c873bb44ba9c8692bb205b96b943fb0
+size 79956

cni.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Fri May 17 12:26:06 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to version 0.7.0:
+  * Spec changes:
+    + Use more RFC2119 style language in specification (must, should...)
+    + add notes about ADD/DEL ordering
+    + Make the container ID required and unique.
+    + remove the version parameter from ADD and DEL commands.
+    + Network interface name matters
+    + be explicit about optional and required structure members
+    + add CHECK method
+    + Add a well-known error for "try again"
+    + SPEC.md: clarify meaning of 'routes'
+  * Library changes:
+    + pkg/types: Makes IPAM concrete type
+    + libcni: return error if Type is empty
+    + skel: VERSION shouldn't block on stdin
+    + non-pointer instances of types.Route now correctly marshal to JSON
+    + libcni: add ValidateNetwork and ValidateNetworkList functions
+    + pkg/skel: return error if JSON config has no network name
+    + skel: add support for plugin version string
+    + libcni: make exec handling an interface for better downstream testing
+    + libcni: api now takes a Context to allow operations to be timed out or cancelled
+    + types/version: add helper to parse PrevResult
+    + skel: only print about message, not errors
+    + skel,invoke,libcni: implementation of CHECK method
+    + cnitool: Honor interface name supplied via CNI_IFNAME environment variable.
+    + cnitool: validate correct number of args
+    + Don't copy gw from IP4.Gateway to Route.GW When converting from 0.2.0
+    + add PrintTo method to Result interface
+    + Return a better error when the plugin returns none
+- Install sleep binary into CNI plugin directory
+- Restore build.sh script which was removed upstream
+
 -------------------------------------------------------------------
 Tue Jun  5 08:21:05 UTC 2018 - dcassany@suse.com
 

cni.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cni
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,7 +21,7 @@
 %define         cni_doc_dir  %{_docdir}/cni
 
 Name:           cni
-Version:        0.6.0
+Version:        0.7.0
 Release:        0
 Summary:        Container Network Interface - networking for Linux containers
 License:        Apache-2.0
@@ -29,6 +29,7 @@ Group:          System/Management
 Url:            https://github.com/containernetworking/cni
 Source:         %{name}-%{version}.tar.xz
 Source1:        99-loopback.conf
+Source2:        build.sh
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
@@ -51,15 +52,17 @@ range of support and the specification is simple to implement.
 
 %prep
 %setup -q
+cp %{SOURCE2} build.sh
 
 %build
-./build.sh
+sh ./build.sh
 
 %install
 
 # install the plugins
 install -m 755 -d "%{buildroot}%{cni_bin_dir}"
 cp bin/noop "%{buildroot}%{cni_bin_dir}/"
+cp bin/sleep "%{buildroot}%{cni_bin_dir}/"
 
 # undo a copy: cnitool must go to sbin/
 install -m 755 -d "%{buildroot}%{_sbindir}"