Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package container-build-checks for
openSUSE:Factory checked in at 2023-04-29 17:27:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/container-build-checks (Old)
and /work/SRC/openSUSE:Factory/.container-build-checks.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "container-build-checks"
Sat Apr 29 17:27:49 2023 rev:9 rq:1083502 version:1682595397.5ce6d2f
Changes:
--------
---
/work/SRC/openSUSE:Factory/container-build-checks/container-build-checks.changes
2022-08-16 17:06:38.511680402 +0200
+++
/work/SRC/openSUSE:Factory/.container-build-checks.new.1533/container-build-checks.changes
2023-04-29 17:27:55.626488544 +0200
@@ -1,0 +2,9 @@
+Fri Apr 28 09:23:53 UTC 2023 - Fabian Vogt <[email protected]>
+
+- Update to version 1682595397.5ce6d2f:
+ * Handle OCI style images as well
+ * Makefile: Add missing dependency of broken-derived on proper-base
+ * GitHub workflow: Update action versions
+ * GitHub workflow: Test python 3.6 and 3.10
+
+-------------------------------------------------------------------
Old:
----
container-build-checks-1650464301.a198cf9.obscpio
New:
----
container-build-checks-1682595397.5ce6d2f.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ container-build-checks.spec ++++++
--- /var/tmp/diff_new_pack.OMPFdt/_old 2023-04-29 17:27:56.238491106 +0200
+++ /var/tmp/diff_new_pack.OMPFdt/_new 2023-04-29 17:27:56.242491122 +0200
@@ -1,7 +1,7 @@
#
# spec file for package container-build-checks
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: container-build-checks
-Version: 1650464301.a198cf9
+Version: 1682595397.5ce6d2f
Release: 0
Summary: Scripts to validate built container images
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.OMPFdt/_old 2023-04-29 17:27:56.294491340 +0200
+++ /var/tmp/diff_new_pack.OMPFdt/_new 2023-04-29 17:27:56.298491357 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/container-build-checks.git</param>
- <param
name="changesrevision">1ff773c9bbb681a3dedb3a8b1514e538cafd6e9a</param></service></servicedata>
+ <param
name="changesrevision">5ce6d2ffdcc3a95bc79b69d8d021c0b0bce41ad7</param></service></servicedata>
(No newline at EOF)
++++++ container-build-checks-1650464301.a198cf9.obscpio ->
container-build-checks-1682595397.5ce6d2f.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/.github/workflows/test.yml
new/container-build-checks-1682595397.5ce6d2f/.github/workflows/test.yml
--- old/container-build-checks-1650464301.a198cf9/.github/workflows/test.yml
2022-04-20 16:18:21.000000000 +0200
+++ new/container-build-checks-1682595397.5ce6d2f/.github/workflows/test.yml
2023-04-27 13:36:37.000000000 +0200
@@ -6,14 +6,22 @@
branches: [ master ]
jobs:
build:
- runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ include:
+ - os: ubuntu-20.04
+ # Version in SLE 15
+ python: "3.6"
+ - os: ubuntu-latest
+ # Version in openSUSE Tumbleweed
+ python: "3.10"
+ runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v2
- # Version in Leap/SLE 15
- - name: Set up Python 3.6
- uses: actions/setup-python@v2
+ - uses: actions/checkout@v3
+ - name: Set up Python 3.10
+ uses: actions/setup-python@v4
with:
- python-version: 3.6
+ python-version: ${{ matrix.python }}
- name: Install dependencies
run: |
pip3 install --upgrade pip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/container-build-checks-1650464301.a198cf9/Makefile
new/container-build-checks-1682595397.5ce6d2f/Makefile
--- old/container-build-checks-1650464301.a198cf9/Makefile 2022-04-20
16:18:21.000000000 +0200
+++ new/container-build-checks-1682595397.5ce6d2f/Makefile 2023-04-27
13:36:37.000000000 +0200
@@ -11,10 +11,23 @@
install -Dm0755 container-build-checks.py
$(DESTDIR)/usr/lib/build/post-build-checks/container-build-checks
# Some test containers depend on other test containers. Make sure those are
built first.
+tests/broken-derived/built: tests/proper-base/built
tests/proper-derived/built: tests/proper-base/built
+tests/oci-proper-derived/built: tests/oci-proper-base/built
tests/local-proper-derived/built: tests/proper-base/built
# Build the Dockerfile and create the tarball
+tests/oci-%/built: tests/%/Dockerfile
+ @dir=$$(dirname $@)
+ pushd $$dir >/dev/null
+ testname=$$(basename $$dir)
+ echo Building OCI $$testname
+ # Build the container
+ podman build --squash -t "c-b-c-tests/$$testname" .
+ podman push "c-b-c-tests/$$testname" oci-archive:$$testname.tar
+ popd >/dev/null
+ touch $@
+
tests/%/built: tests/%/Dockerfile
@dir=$$(dirname $@)
pushd $$dir >/dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/container-build-checks.py
new/container-build-checks-1682595397.5ce6d2f/container-build-checks.py
--- old/container-build-checks-1650464301.a198cf9/container-build-checks.py
2022-04-20 16:18:21.000000000 +0200
+++ new/container-build-checks-1682595397.5ce6d2f/container-build-checks.py
2023-04-27 13:36:37.000000000 +0200
@@ -14,14 +14,23 @@
class Image:
"""Information about the image to be tested."""
- def __init__(self, containerinfo, tarfile):
- self.containerinfo = containerinfo
- self.tarfile = tarfile
- self.manifest = json.load(tar.extractfile("manifest.json"))
- if len(self.manifest) != 1:
- raise Exception("Manifest doesn't have exactly one entry")
- self.config =
json.load(self.tarfile.extractfile(self.manifest[0]["Config"]))
+ def __init__(self, containerinfo, tar):
+ self.containerinfo = containerinfo
+ self.tarfile = tar
+ if "oci-layout" in self.tarfile.getnames():
+ self.index = json.load(tar.extractfile("index.json"))
+ if len(self.index["manifests"]) != 1:
+ raise Exception("OCI index doesn't have exactly one entry")
+ manifest = "blobs/" +
self.index["manifests"][0]["digest"].replace(":", "/")
+ self.manifest = json.load(tar.extractfile(manifest))
+ config = "blobs/" + self.manifest["config"]["digest"].replace(":",
"/")
+ else:
+ self.manifest = json.load(tar.extractfile("manifest.json"))
+ if len(self.manifest) != 1:
+ raise Exception("Manifest doesn't have exactly one entry")
+ config = self.manifest[0]["Config"]
+ self.config = json.load(self.tarfile.extractfile(config))
self.is_local_build = "release" not in containerinfo and "disturl" not
in containerinfo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/Dockerfile
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/Dockerfile
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/Dockerfile
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/Dockerfile
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,18 @@
+FROM scratch
+LABEL
org.openbuildservice.disturl="obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker"
+LABEL org.opencontainers.image.created="2021-05-20T00:23:03.624005870Z"
+LABEL org.opencontainers.image.description="Image containing a minimal
environment for containers based on openSUSE Tumbleweed."
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed Base Container"
+LABEL org.opencontainers.image.url="https://www.opensuse.org/";
+LABEL org.opencontainers.image.vendor="openSUSE Project"
+LABEL org.opencontainers.image.version="20210519.14.19"
+LABEL org.opensuse.base.created="2021-05-20T00:23:03.624005870Z"
+LABEL org.opensuse.base.description="Image containing a minimal environment
for containers based on openSUSE Tumbleweed."
+LABEL
org.opensuse.base.disturl="obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker"
+LABEL
org.opensuse.base.reference="registry.opensuse.org/opensuse/tumbleweed:20210519.14.19"
+LABEL org.opensuse.base.title="openSUSE Tumbleweed Base Container"
+LABEL org.opensuse.base.url="https://www.opensuse.org/";
+LABEL org.opensuse.base.vendor="openSUSE Project"
+LABEL org.opensuse.base.version="20210519.14.19"
+LABEL
org.opensuse.reference="registry.opensuse.org/opensuse/tumbleweed:20210519.14.19"
+COPY some-file /some-file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/checks.out
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/checks.out
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/checks.out
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/checks.out
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,9 @@
+Looking at oci-proper-base.containerinfo
+Release: 14.19
+Tag: opensuse/tumbleweed:latest
+Tag: opensuse/tumbleweed:20210519
+Tag: opensuse/tumbleweed:20210519.14.19
+Detected image specific label prefix: org.opensuse.base
+
+container-build-checks done. Hints: 0 Warnings: 0 Errors: 0
+Exited with 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/oci-proper-base.containerinfo
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/oci-proper-base.containerinfo
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/oci-proper-base.containerinfo
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/oci-proper-base.containerinfo
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,30 @@
+{
+ "buildtime" : 1621470206,
+ "disturl" :
"obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker",
+ "file" : "oci-proper-base.tar",
+ "goarch" : "amd64",
+ "goos" : "linux",
+ "imageid" :
"11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78",
+ "name" : "opensuse-tumbleweed-image",
+ "release" : "14.19",
+ "repos" : [
+ {
+ "url" : "obsrepositories:/"
+ }
+ ],
+ "tags" : [
+ "opensuse/tumbleweed:latest",
+ "opensuse/tumbleweed:20210519",
+ "opensuse/tumbleweed:20210519.14.19"
+ ],
+ "tar_blobids" : [
+
"sha256:11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78",
+ "sha256:89a8c2a08e572bfd8ef8eb05648638443f0d50e4c9e9913f01adbeb2e89ec9cd"
+ ],
+ "tar_manifest" :
"[{\"Config\":\"sha256:11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78\",\"RepoTags\":[\"opensuse/tumbleweed:latest\",\"opensuse/tumbleweed:20210519\",\"opensuse/tumbleweed:20210519.14.19\"],\"Layers\":[\"sha256:89a8c2a08e572bfd8ef8eb05648638443f0d50e4c9e9913f01adbeb2e89ec9cd\"]}]",
+ "tar_md5sum" : "eb472571d516e44c1c05dc73a47f61e7",
+ "tar_mtime" : 1621470212,
+ "tar_sha256sum" :
"7e8b9aaad5222b8680f17ffcf4c7f514783d86e3193b7f925c066a14113080de",
+ "tar_size" : 36567552,
+ "version" : "1.0.4"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/some-file
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/some-file
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-base/some-file
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-base/some-file
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1 @@
+Hi!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/Dockerfile
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/Dockerfile
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/Dockerfile
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/Dockerfile
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,15 @@
+FROM c-b-c-tests/oci-proper-base
+LABEL io.buildah.version="1.20.1"
+LABEL
org.openbuildservice.disturl="obs://build.opensuse.org/home:favogt:container-checks/containerfile/e6f02b3d61214e205f11d1c2075b14cc-dockerfile-application-container"
+LABEL org.opencontainers.image.created="2021-05-21T14:28:22.338350130Z"
+LABEL org.opencontainers.image.description="This contains nano 5.7"
+LABEL org.opencontainers.image.title="Example container"
+LABEL org.opencontainers.image.version="5.7"
+LABEL org.opensuse.example.created="2021-05-21T14:28:22.338350130Z"
+LABEL org.opensuse.example.description="This contains nano 5.7"
+LABEL
org.opensuse.example.disturl="obs://build.opensuse.org/home:favogt:container-checks/containerfile/e6f02b3d61214e205f11d1c2075b14cc-dockerfile-application-container"
+LABEL
org.opensuse.example.reference="registry.opensuse.org/opensuse/example:5.7.7.21"
+LABEL org.opensuse.example.title="Example container"
+LABEL org.opensuse.example.version="5.7"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/example:5.7.7.21"
+COPY some-file /some-file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/checks.out
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/checks.out
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/checks.out
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/checks.out
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,10 @@
+Looking at oci-proper-derived.containerinfo
+Release: 7.21
+Tag: opensuse/example:latest
+Tag: opensuse/example:5.7
+Tag: opensuse/example:5.7.7.21
+Tag: kubic/testtag:latest
+Detected image specific label prefix: org.opensuse.example
+
+container-build-checks done. Hints: 0 Warnings: 0 Errors: 0
+Exited with 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/oci-proper-derived.containerinfo
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/oci-proper-derived.containerinfo
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/oci-proper-derived.containerinfo
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/oci-proper-derived.containerinfo
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1,31 @@
+{
+ "buildtime" : 1621607310,
+ "disturl" :
"obs://build.opensuse.org/home:favogt:container-checks/containerfile/e6f02b3d61214e205f11d1c2075b14cc-dockerfile-application-container",
+ "file" : "oci-proper-derived.tar",
+ "goarch" : "amd64",
+ "goos" : "linux",
+ "imageid" :
"df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09",
+ "release" : "7.21",
+ "repos" : [
+ {
+ "url" : "obsrepositories:/"
+ }
+ ],
+ "tags" : [
+ "opensuse/example:latest",
+ "opensuse/example:5.7",
+ "opensuse/example:5.7.7.21",
+ "kubic/testtag:latest"
+ ],
+ "tar_blobids" : [
+
"sha256:43e763c1a9ac8eaa809d77c4ad0c543d78a826ba9d811eae19624c31e799fd1c",
+
"sha256:a0ea0ce79dfa175149b9f715342e13a9472ee6bfaeccfd4ecc6827f2494aef18",
+ "sha256:df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09"
+ ],
+ "tar_manifest" :
"[{\"Config\":\"sha256:df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09\",\"RepoTags\":[\"opensuse/example:latest\",\"opensuse/example:5.7\",\"opensuse/example:5.7.7.21\"],\"Layers\":[\"sha256:a0ea0ce79dfa175149b9f715342e13a9472ee6bfaeccfd4ecc6827f2494aef18\",\"sha256:43e763c1a9ac8eaa809d77c4ad0c543d78a826ba9d811eae19624c31e799fd1c\"]}]",
+ "tar_md5sum" : "72c8bfea4f24b5954cea7b788093e25c",
+ "tar_mtime" : 1621607315,
+ "tar_sha256sum" :
"ee6344740bd7c23a9e4b9f2b5ff031b95566a0a7613ff082ed3a856a5559e297",
+ "tar_size" : 40647680,
+ "version" : "5.7"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/some-file
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/some-file
---
old/container-build-checks-1650464301.a198cf9/tests/oci-proper-derived/some-file
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1682595397.5ce6d2f/tests/oci-proper-derived/some-file
2023-04-27 13:36:37.000000000 +0200
@@ -0,0 +1 @@
+Hi!
++++++ container-build-checks.obsinfo ++++++
--- /var/tmp/diff_new_pack.OMPFdt/_old 2023-04-29 17:27:56.410491826 +0200
+++ /var/tmp/diff_new_pack.OMPFdt/_new 2023-04-29 17:27:56.414491843 +0200
@@ -1,5 +1,5 @@
name: container-build-checks
-version: 1650464301.a198cf9
-mtime: 1650464301
-commit: a198cf9474860b6746f131dc2c5d7f04225ba202
+version: 1682595397.5ce6d2f
+mtime: 1682595397
+commit: 5ce6d2ffdcc3a95bc79b69d8d021c0b0bce41ad7
