From 6329c7e290b9d0f9b58d821ab65d592ba83aa335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 19 Sep 2023 13:55:13 +0200 Subject: [PATCH 1/2] versions: Specify forked / vanilla entries of containerd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As we'll need to test with both the vanilla and the forked versions of containerd, let's make sure we'll specify both entries as part of our versions.yaml file, and we can read whatever we need accordingly as part of our tests jobs. Signed-off-by: Fabiano Fidêncio --- versions.yaml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/versions.yaml b/versions.yaml index 2be6456807..6a1d980063 100644 --- a/versions.yaml +++ b/versions.yaml @@ -221,14 +221,23 @@ externals: containerd: description: | Containerd for Kubernetes Container Runtime Interface. - # CCv0 is using our fork of containerd as the changes can't be merged yet - # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0 - url: "github.com/confidential-containers/containerd" - # yamllint disable-line rule:line-length - tarball_url: "https://github.com/confidential-containers/containerd/releases/download" - version: "v1.6.8.2" - # CCv0 needs to know about the specific branch for the integration tests - branch: "CC-main" + forked: + # CCv0 is using our fork of containerd as the changes can't be merged yet + # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0 + url: "github.com/confidential-containers/containerd" + # yamllint disable-line rule:line-length + tarball_url: "https://github.com/confidential-containers/containerd/releases/download" + version: "v1.6.8.2" + # CCv0 needs to know about the specific branch for the integration tests + branch: "CC-main" + upstream: + # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0 + url: "github.com/containerd/containerd" + # yamllint disable-line rule:line-length + tarball_url: "https://github.com/containerd/containerd/releases/download" + version: "v1.6.8" + # CCv0 needs to know about the specific branch for the integration tests + branch: "release/1.6" critools: description: "CLI tool for Container Runtime Interface (CRI)" From b07dfbe213ddb6313254f3b0fe3d7c5997a99aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 13 Sep 2023 21:16:28 +0200 Subject: [PATCH 2/2] versions: Bump nydus and nydus-snapshotter to its latest release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As we need https://github.com/containerd/nydus-snapshotter/pull/530 in. Fixes #7984 Signed-off-by: Fabiano Fidêncio Signed-off-by: ChengyuZhu6 --- versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.yaml b/versions.yaml index 6a1d980063..a39a285682 100644 --- a/versions.yaml +++ b/versions.yaml @@ -300,12 +300,12 @@ externals: nydus: description: "Nydus image acceleration service" url: "https://github.com/dragonflyoss/image-service" - version: "v2.2.1" + version: "v2.2.3" nydus-snapshotter: description: "Snapshotter for Nydus image acceleration service" url: "https://github.com/containerd/nydus-snapshotter" - version: "v0.3.3" + version: "v0.12.0" ovmf: description: "Firmware, implementation of UEFI for virtual machines."