Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package katacontainers-image-initrd for
openSUSE:Factory checked in at 2021-01-19 16:01:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old)
and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.28504
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "katacontainers-image-initrd"
Tue Jan 19 16:01:54 2021 rev:17 rq:864110 version:1.11.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes
2020-06-22 17:46:32.249965886 +0200
+++
/work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.28504/katacontainers-image-initrd.changes
2021-01-19 16:02:29.427406818 +0100
@@ -1,0 +2,12 @@
+Mon Jan 18 15:25:56 UTC 2021 - Richard Brown <[email protected]>
+
+- Fix building with RPM 4.16
+
+-------------------------------------------------------------------
+Fri Jan 8 12:52:56 UTC 2021 - Richard Brown <[email protected]>
+
+- Update to 1.11.5:
+ agent:
+ * add grpc endpoint to retrieve oom events`
+
+-------------------------------------------------------------------
Old:
----
agent-1.11.1.tar.xz
osbuilder-1.11.1.tar.xz
New:
----
agent-1.11.5.tar.xz
osbuilder-1.11.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ katacontainers-image-initrd.spec ++++++
--- /var/tmp/diff_new_pack.wjPk9o/_old 2021-01-19 16:02:30.431408335 +0100
+++ /var/tmp/diff_new_pack.wjPk9o/_new 2021-01-19 16:02:30.435408341 +0100
@@ -1,7 +1,7 @@
#
# spec file for package katacontainers-image-initrd
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -44,7 +44,7 @@
%endif
Name: katacontainers-image-initrd
-Version: 1.11.1
+Version: 1.11.5
Release: 0
Summary: Kata Containers image (initrd) and kernel
License: Apache-2.0
@@ -74,7 +74,7 @@
kata_kmodules=(9p 9pnet 9pnet_virtio)
-%if 0%{?suse_version} <= 1500 || %{kernel_flavor} != "kvmsmall"
+%if 0%{?suse_version} <= 1500 || "%{kernel_flavor}" != "kvmsmall"
kata_kmodules+=( \
virtio \
virtio_pci \
++++++ _service ++++++
--- /var/tmp/diff_new_pack.wjPk9o/_old 2021-01-19 16:02:30.479408409 +0100
+++ /var/tmp/diff_new_pack.wjPk9o/_new 2021-01-19 16:02:30.479408409 +0100
@@ -6,8 +6,8 @@
<param name="url">https://github.com/kata-containers/osbuilder.git</param>
<param name="filename">osbuilder</param>
<!--- versionformat defines the name of the tarball. -->
- <param name="versionformat">1.11.1</param>
- <param name="revision">1.11.1</param>
+ <param name="versionformat">1.11.5</param>
+ <param name="revision">1.11.5</param>
</service>
<service name="tar_scm" mode="disabled">
@@ -15,8 +15,8 @@
<param name="url">https://github.com/kata-containers/agent.git</param>
<param name="filename">agent</param>
<!--- versionformat defines the name of the tarball. -->
- <param name="versionformat">1.11.1</param>
- <param name="revision">1.11.1</param>
+ <param name="versionformat">1.11.5</param>
+ <param name="revision">1.11.5</param>
</service>
<service name="recompress" mode="disabled">
++++++ agent-1.11.1.tar.xz -> agent-1.11.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/.github/workflows/PR-wip-checks.yaml
new/agent-1.11.5/.github/workflows/PR-wip-checks.yaml
--- old/agent-1.11.1/.github/workflows/PR-wip-checks.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/agent-1.11.5/.github/workflows/PR-wip-checks.yaml 2020-11-11
22:51:27.000000000 +0100
@@ -0,0 +1,21 @@
+name: Pull request WIP checks
+on:
+ pull_request:
+ types:
+ - opened
+ - synchronize
+ - reopened
+ - edited
+ - labeled
+ - unlabeled
+
+jobs:
+ pr_wip_check:
+ runs-on: ubuntu-latest
+ name: WIP Check
+ steps:
+ - name: WIP Check
+ uses: tim-actions/wip-check@1c2a1ca6c110026b3e2297bb2ef39e1747b5a755
+ with:
+ labels: '["do-not-merge", "wip", "rfc"]'
+ keywords: '["WIP", "wip", "RFC", "rfc", "dnm", "DNM", "do-not-merge"]'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/.github/workflows/dco-check.yaml
new/agent-1.11.5/.github/workflows/dco-check.yaml
--- old/agent-1.11.1/.github/workflows/dco-check.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/agent-1.11.5/.github/workflows/dco-check.yaml 2020-11-11
22:51:27.000000000 +0100
@@ -0,0 +1,22 @@
+name: DCO check
+on:
+ pull_request:
+ types:
+ - opened
+ - reopened
+ - synchronize
+
+jobs:
+ dco_check_job:
+ runs-on: ubuntu-latest
+ name: DCO Check
+ steps:
+ - name: Get PR Commits
+ id: 'get-pr-commits'
+ uses: tim-actions/get-pr-commits@ed97a21c3f83c3417e67a4733ea76887293a2c8f
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ - name: DCO Check
+ uses: tim-actions/dco@2fd0504dc0d27b33f542867c300c60840c6dcb20
+ with:
+ commits: ${{ steps.get-pr-commits.outputs.commits }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/VERSION new/agent-1.11.5/VERSION
--- old/agent-1.11.1/VERSION 2020-06-06 00:37:00.000000000 +0200
+++ new/agent-1.11.5/VERSION 2020-11-11 22:51:27.000000000 +0100
@@ -1 +1 @@
-1.11.1
+1.11.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/device.go new/agent-1.11.5/device.go
--- old/agent-1.11.1/device.go 2020-06-06 00:37:00.000000000 +0200
+++ new/agent-1.11.5/device.go 2020-11-11 22:51:27.000000000 +0100
@@ -493,7 +493,7 @@
Major: devMajor,
Minor: devMinor,
Type: "b",
- Access: "rwm",
+ Access: "rw",
}
spec.Linux.Resources.Devices = append(spec.Linux.Resources.Devices,
nvdimmCg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/grpc.go new/agent-1.11.5/grpc.go
--- old/agent-1.11.1/grpc.go 2020-06-06 00:37:00.000000000 +0200
+++ new/agent-1.11.5/grpc.go 2020-11-11 22:51:27.000000000 +0100
@@ -676,14 +676,14 @@
a.sandbox.addGuestHooks(ociSpec)
// write the OCI spec to a file so that hooks can read it
- err = writeSpecToFile(ociSpec)
+ err = writeSpecToFile(ociSpec, req.ContainerId)
if err != nil {
return emptyResp, err
}
// Change cwd because libcontainer assumes the bundle path is
the cwd:
//
https://github.com/opencontainers/runc/blob/v1.0.0-rc5/libcontainer/specconv/spec_linux.go#L157
- oldcwd, err := changeToBundlePath(ociSpec)
+ oldcwd, err := changeToBundlePath(ociSpec, req.ContainerId)
if err != nil {
return emptyResp, err
}
@@ -1298,6 +1298,9 @@
}
}
+ configJsonDir := filepath.Join("/run/libcontainer/", req.ContainerId)
+ //Best effort.. Ignore any errors in the deletion of the directory
+ _ = os.RemoveAll(configJsonDir)
delete(a.sandbox.containers, ctr.id)
return emptyResp, nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/oci.go new/agent-1.11.5/oci.go
--- old/agent-1.11.1/oci.go 2020-06-06 00:37:00.000000000 +0200
+++ new/agent-1.11.5/oci.go 2020-11-11 22:51:27.000000000 +0100
@@ -22,13 +22,18 @@
const (
ociConfigFile string = "config.json"
ociConfigFileMode os.FileMode = 0444
+ ociConfigBasePath string = "/run/libcontainer"
)
-// writeSpecToFile writes the container's OCI spec to
"dirname(spec.Root.Path)/config.json"
-// This effectively makes the parent directory a valid OCI bundle.
-func writeSpecToFile(spec *specs.Spec) error {
- bundlePath := filepath.Dir(spec.Root.Path)
- configPath := filepath.Join(bundlePath, ociConfigFile)
+// writeSpecToFile writes the container's OCI spec to
"/run/libcontainer/<container-id>/config.json"
+// Note that the OCI bundle (rootfs) is at a different path
+func writeSpecToFile(spec *specs.Spec, containerId string) error {
+ configJsonDir := filepath.Join(ociConfigBasePath, containerId)
+ err := os.MkdirAll(configJsonDir, 0700)
+ if err != nil {
+ return err
+ }
+ configPath := filepath.Join(configJsonDir, ociConfigFile)
f, err := os.OpenFile(configPath, os.O_WRONLY|os.O_CREATE,
ociConfigFileMode)
if err != nil {
return err
@@ -40,7 +45,7 @@
// changeToBundlePath changes the cwd to the OCI bundle path defined as
// dirname(spec.Root.Path) and returns the old cwd.
-func changeToBundlePath(spec *specs.Spec) (string, error) {
+func changeToBundlePath(spec *specs.Spec, containerId string) (string, error) {
cwd, err := os.Getwd()
if err != nil {
return cwd, err
@@ -51,9 +56,10 @@
}
bundlePath := filepath.Dir(spec.Root.Path)
- configPath := filepath.Join(bundlePath, ociConfigFile)
+ configPath := filepath.Join(ociConfigBasePath, containerId,
ociConfigFile)
- // Verify that config.json is present at the root of the bundle path.
+ // config.json is at "/run/libcontainer/<container-id>/"
+ // Actual bundle (rootfs) is at dirname(spec.Root.Path)
if _, err := os.Stat(configPath); err != nil {
return cwd, errors.New("invalid OCI bundle")
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agent-1.11.1/oci_test.go new/agent-1.11.5/oci_test.go
--- old/agent-1.11.1/oci_test.go 2020-06-06 00:37:00.000000000 +0200
+++ new/agent-1.11.5/oci_test.go 2020-11-11 22:51:27.000000000 +0100
@@ -17,6 +17,8 @@
)
func TestChangeToBundlePath(t *testing.T) {
+ skipUnlessRoot(t)
+ containerId := "1"
assert := assert.New(t)
originalCwd, err := os.Getwd()
@@ -37,15 +39,15 @@
Readonly: false,
}
- _, err = changeToBundlePath(spec)
+ _, err = changeToBundlePath(spec, containerId)
assert.Error(err)
// Write the spec file to create a valid OCI bundle
spec.Root.Path = rootfsPath
- err = writeSpecToFile(spec)
+ err = writeSpecToFile(spec, containerId)
assert.NoError(err)
- cwd, err := changeToBundlePath(spec)
+ cwd, err := changeToBundlePath(spec, containerId)
assert.NoError(err)
assert.Equal(cwd, originalCwd)
@@ -55,6 +57,8 @@
}
func TestWriteSpecToFile(t *testing.T) {
+ skipUnlessRoot(t)
+ containerId := "1"
assert := assert.New(t)
bundlePath, err := ioutil.TempDir("", "bundle")
@@ -75,10 +79,17 @@
Readonly: false,
},
}
- err = writeSpecToFile(spec)
+ err = writeSpecToFile(spec, containerId)
assert.NoError(err)
file, err := os.Open(path.Join(bundlePath, ociConfigFile))
+ assert.Error(err)
+ defer file.Close()
+
+ _, err = file.Stat()
+ assert.Error(err)
+
+ file, err = os.Open(path.Join("/run/libcontainer/", containerId,
ociConfigFile))
assert.NoError(err)
defer file.Close()
++++++ osbuilder-1.11.1.tar.xz -> osbuilder-1.11.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osbuilder-1.11.1/.ci/run.sh
new/osbuilder-1.11.5/.ci/run.sh
--- old/osbuilder-1.11.1/.ci/run.sh 2020-06-06 00:42:20.000000000 +0200
+++ new/osbuilder-1.11.5/.ci/run.sh 2020-11-11 20:50:58.000000000 +0100
@@ -13,6 +13,3 @@
script_dir="$(dirname $(readlink -f $0))"
sudo -E PATH="$PATH" bash "${script_dir}/../tests/test_images.sh"
-
-# run again to build rust agent
-sudo -E RUST_AGENT="yes" PATH="$PATH" bash
"${script_dir}/../tests/test_images.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osbuilder-1.11.1/.github/workflows/PR-wip-checks.yaml
new/osbuilder-1.11.5/.github/workflows/PR-wip-checks.yaml
--- old/osbuilder-1.11.1/.github/workflows/PR-wip-checks.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/osbuilder-1.11.5/.github/workflows/PR-wip-checks.yaml 2020-11-11
20:50:58.000000000 +0100
@@ -0,0 +1,21 @@
+name: Pull request WIP checks
+on:
+ pull_request:
+ types:
+ - opened
+ - synchronize
+ - reopened
+ - edited
+ - labeled
+ - unlabeled
+
+jobs:
+ pr_wip_check:
+ runs-on: ubuntu-latest
+ name: WIP Check
+ steps:
+ - name: WIP Check
+ uses: tim-actions/wip-check@1c2a1ca6c110026b3e2297bb2ef39e1747b5a755
+ with:
+ labels: '["do-not-merge", "wip", "rfc"]'
+ keywords: '["WIP", "wip", "RFC", "rfc", "dnm", "DNM", "do-not-merge"]'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osbuilder-1.11.1/.github/workflows/dco-check.yaml
new/osbuilder-1.11.5/.github/workflows/dco-check.yaml
--- old/osbuilder-1.11.1/.github/workflows/dco-check.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/osbuilder-1.11.5/.github/workflows/dco-check.yaml 2020-11-11
20:50:58.000000000 +0100
@@ -0,0 +1,22 @@
+name: DCO check
+on:
+ pull_request:
+ types:
+ - opened
+ - reopened
+ - synchronize
+
+jobs:
+ dco_check_job:
+ runs-on: ubuntu-latest
+ name: DCO Check
+ steps:
+ - name: Get PR Commits
+ id: 'get-pr-commits'
+ uses: tim-actions/get-pr-commits@ed97a21c3f83c3417e67a4733ea76887293a2c8f
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ - name: DCO Check
+ uses: tim-actions/dco@2fd0504dc0d27b33f542867c300c60840c6dcb20
+ with:
+ commits: ${{ steps.get-pr-commits.outputs.commits }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osbuilder-1.11.1/VERSION new/osbuilder-1.11.5/VERSION
--- old/osbuilder-1.11.1/VERSION 2020-06-06 00:42:20.000000000 +0200
+++ new/osbuilder-1.11.5/VERSION 2020-11-11 20:50:58.000000000 +0100
@@ -1 +1 @@
-1.11.1
+1.11.5
