Merge ~lucaskanashiro/ubuntu/+source/containerd:merge-noble into ubuntu/+source/containerd:debian/sid

[Lucas Kanashiro]

Merge version 1.6.20_ds1-1 from Debian. Most of the delta must be kept because of src:containerd-app, a single patch was removed because it does not seem to be needed anymore.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/container-backports/+packages

autopkgtest summary:

autopkgtest [16:50:43]: @@@@@@@@@@@@@@@@@@@@ summary
build-only PASS
dh-golang-autopkgtest PASS

[Athos Ribeiro (athos-ribeiro)]

Thanks, Lucas.

- The commit message for 3093cdb is incomplete. It also causes the second entry in the changelog to be incomplete.

Other than that, this LGTM.

review: Needs Information

[Lucas Kanashiro (lucaskanashiro)]

Thanks for catching this Athos :) The commit message and the changelog entry are fixed now.

[Athos Ribeiro (athos-ribeiro)]

LGTM!

Thanks, Lucas :)

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lucaskanashiro, athos-ribeiro
Uploaders: lucaskanashiro, athos-ribeiro
MP auto-approved

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Athos, package uploaded:

Uploading containerd_1.6.24~ds1-1ubuntu1.dsc
Uploading containerd_1.6.24~ds1.orig.tar.xz
Uploading containerd_1.6.24~ds1-1ubuntu1.debian.tar.xz
Uploading containerd_1.6.24~ds1-1ubuntu1_source.buildinfo
Uploading containerd_1.6.24~ds1-1ubuntu1_source.changes

[Andreas Hasenack (ahasenack)]

This migrated already, marking the MP as merged.

diff --git a/debian/changelog b/debian/changelog
index c5076e3..a852b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+containerd (1.6.24~ds1-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040374). Remaining changes:
+    - d/control: remove the binary paragraph for containerd.
+    - d/containerd.*: remove all packaging related files associated to the
+      containerd binary package.
+    - d/tests/{cri-integration,integration}: remove since they depend on the
+      containerd binary package which is not provided by this source package
+      anymore.
+    - d/rules: remove execute_after_dh_auto_build target, it is changing
+      content in the containerd binary package. Also avoid installing binaries
+      in the library package.
+    - d/golang-github-containerd-containerd-dev.install: remove this file, it
+      is causing a FTBFS, no need to have it in place, the library files are
+      already installed correctly without it.
+    - d/golang-github-containerd-containerd-dev.docs: install NOTICE file to
+      be compliant with the Apache 2 license.
+  * Dropped:
+    - d/p/0009-Skip-test-trying-to-set-OOM-score.patch: fix FTBFS.
+      [Not needed anymore]
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 12 Jan 2024 19:00:15 -0300
+
 containerd (1.6.24~ds1-1) unstable; urgency=medium
 
   * New upstream version 1.6.24~ds1
@@ -13,6 +36,36 @@ containerd (1.6.20~ds1-2) unstable; urgency=medium
 
  -- Shengjing Zhu <[e-mail]>  Wed, 23 Aug 2023 13:48:17 +0800
 
+containerd (1.6.20~ds1-1ubuntu2) mantic; urgency=medium
+
+  * d/p/0009-Skip-test-trying-to-set-OOM-score.patch: fix FTBFS.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 21 Jun 2023 23:07:52 -0300
+
+containerd (1.6.20~ds1-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: #2022390). Make src:containerd
+    follow Debian and src:containerd-app is going to ship the application with
+    vendorized dependencies so we can keep updating just the application across
+    all supported releases.
+  * Added changes:
+    - d/control: remove the binary paragraph for containerd.
+    - d/containerd.*: remove all packaging related files associated to the
+      containerd binary package.
+    - d/tests/{cri-integration,integration}: remove since they depend on the
+      containerd binary package which is not provided by this source package
+      anymore.
+    - d/rules: remove execute_after_dh_auto_build target, it is changing
+      content in the containerd binary package. Also avoid installing binaries
+      in the library package.
+    - d/golang-github-containerd-containerd-dev.install: remove this file, it
+      is causing a FTBFS, no need to have it in place, the library files are
+      already installed correctly without it.
+    - d/golang-github-containerd-containerd-dev.docs: install NOTICE file to
+      be compliant with the Apache 2 license.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 21 Jun 2023 11:53:33 -0300
+
 containerd (1.6.20~ds1-1) unstable; urgency=medium
 
   * New upstream version 1.6.20~ds1
diff --git a/debian/containerd.install b/debian/containerd.install
deleted file mode 100644
index a24d979..0000000
--- a/debian/containerd.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/bash-completion/ctr /usr/share/bash-completion/completions/
-debian/config.toml /etc/containerd/
-debian/zsh-completion/_ctr /usr/share/zsh/vendor-completions/
-usr/bin
diff --git a/debian/containerd.manpages b/debian/containerd.manpages
deleted file mode 100644
index 669e06c..0000000
--- a/debian/containerd.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-man/containerd-config.8
-man/containerd-config.toml.5
-man/containerd.8
-man/ctr.8
diff --git a/debian/control b/debian/control
index 3d4d0ac..8441d2a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: containerd
 Section: admin
 Priority: optional
-Maintainer: Debian Go Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Go Packaging Team <[e-mail]>
 Uploaders: Tianon Gravi <[e-mail]>,
            Tim Potter <[e-mail]>,
            Shengjing Zhu <[e-mail]>,
@@ -76,27 +77,6 @@ Vcs-Browser: https://salsa.debian.org/go-team/packages/containerd
 XS-Go-Import-Path: github.com/containerd/containerd
 Testsuite: autopkgtest-pkg-go
 
-Package: containerd
-Build-Profiles: <!pkg.containerd.onlydev>
-Architecture: linux-any
-Breaks: docker.io (<< 1.12),
-Depends: runc (>= 0.1.0~),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Suggests: containernetworking-plugins,
-Built-Using: ${misc:Built-Using},
-Description: open and reliable container runtime
- Containerd is an industry-standard container runtime with an emphasis on
- simplicity, robustness and portability. It is available as a daemon for
- Linux and Windows, which can manage the complete container life cycle of
- its host system: image transfer and storage, container execution and
- supervision, low-level storage and network attachments, etc.
- .
- Containerd is designed to be embedded into a larger system, rather than
- being used directly by developers or end-users.
- .
- This package contains the binaries.
-
 Package: golang-github-containerd-containerd-dev
 Architecture: all
 Section: golang
diff --git a/debian/containerd.docs b/debian/golang-github-containerd-containerd-dev.docs
similarity index 50%
rename from debian/containerd.docs
rename to debian/golang-github-containerd-containerd-dev.docs
index 5a277f9..6d5ee1d 100644
--- a/debian/containerd.docs
+++ b/debian/golang-github-containerd-containerd-dev.docs
@@ -1,3 +1 @@
 NOTICE
-README.md
-docs/*.md
diff --git a/debian/golang-github-containerd-containerd-dev.install b/debian/golang-github-containerd-containerd-dev.install
deleted file mode 100644
index eab67da..0000000
--- a/debian/golang-github-containerd-containerd-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gocode/src/
diff --git a/debian/rules b/debian/rules
index ebb2872..e6d52b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,23 +27,7 @@ export DH_GOLANG_EXCLUDES := $(EXCLUDES)
 override_dh_auto_build:
 	dh_auto_build -- -ldflags '$(GO_LDFLAGS)'
 
-ifeq (,$(AUTOPKGTEST_TMP))
-execute_after_dh_auto_build:
-	mkdir -p man
-	make man/containerd-config.8
-	make man/containerd-config.toml.5
-	_build/bin/gen-manpages containerd.8 man
-	_build/bin/gen-manpages ctr.8 man
-	rm -vf _build/bin/gen-manpages
-
-	sed 's|/usr/local/bin|/usr/bin|' containerd.service > debian/containerd.service
-	mkdir -vp debian/bash-completion
-	install -m644 -T /usr/share/gocode/src/github.com/urfave/cli/autocomplete/bash_autocomplete \
-		debian/bash-completion/ctr
-	mkdir -vp debian/zsh-completion
-	sed 's|$$PROG|ctr|g' /usr/share/gocode/src/github.com/urfave/cli/autocomplete/zsh_autocomplete > \
-		debian/zsh-completion/_ctr
-endif
-
 override_dh_auto_install:
 	DH_GOLANG_EXCLUDES="$(EXCLUDES) $(EXTRA_EXCLUDES)" dh_auto_install
+	# Do not install binaries
+	rm -rf debian/golang-github-containerd-containerd-dev/usr/bin
diff --git a/debian/tests/control b/debian/tests/control
index 4a9ad6a..306d7cb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,23 +1,3 @@
-Tests: integration
-Depends: ca-certificates,
-         containerd,
-         lsof,
-         @builddeps@,
-Restrictions: allow-stderr, needs-root, needs-internet, isolation-container, flaky
-# Integration test uses k8s.gcr.io/pause:3.5 image
-# See the supported architectures for this image:
-# $ curl https://k8s.gcr.io/v2/pause/manifests/3.2
-Architecture: amd64, arm64, armel, armhf, ppc64el, s390x
-
-Tests: cri-integration
-Depends: ca-certificates,
-         containerd,
-         containernetworking-plugins,
-         procps,
-         @builddeps@,
-Restrictions: allow-stderr, needs-root, needs-internet, isolation-container, flaky
-Architecture: amd64, arm64, ppc64el
-
 Tests: build-only
 Depends: dh-golang,
          golang-any,
diff --git a/debian/tests/cri-integration b/debian/tests/cri-integration
deleted file mode 100755
index 579a35c..0000000
--- a/debian/tests/cri-integration
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-dh_auto_configure -O--buildsystem=golang -O--builddirectory=_build
-
-# overlayfs not work in lxc
-find _build/ -name snapshotter_default_linux.go -exec sed -i 's|DefaultSnapshotter = "overlayfs"|DefaultSnapshotter = "native"|g' {} +
-
-DH_GOPKG=github.com/containerd/containerd/integration/failpoint/cmd \
-  dh_auto_build -O--buildsystem=golang -O--builddirectory=_build
-
-cp -v _build/bin/containerd-shim-runc-fp-v1 /usr/local/bin/
-cp -v _build/bin/cni-bridge-fp /usr/lib/cni
-
-mkdir -p /etc/cni/net.d /etc/cni-fp/net.d
-cat << EOF | tee /etc/cni/net.d/10-containerd-net.conflist
-{
-  "cniVersion": "1.0.0",
-  "name": "containerd-net",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "cni0",
-      "isGateway": true,
-      "ipMasq": true,
-      "promiscMode": true,
-      "ipam": {
-        "type": "host-local",
-        "ranges": [
-          [{
-            "subnet": "10.88.0.0/16"
-          }],
-          [{
-            "subnet": "2001:4860:4860::/64"
-          }]
-        ],
-        "routes": [
-          { "dst": "0.0.0.0/0" },
-          { "dst": "::/0" }
-        ]
-      }
-    },
-    {
-      "type": "portmap",
-      "capabilities": {"portMappings": true}
-    }
-  ]
-}
-EOF
-
-cat << EOF | tee /etc/cni-fp/net.d/10-containerd-net.conflist
-{
-  "cniVersion": "1.0.0",
-  "name": "containerd-net-failpoint",
-  "plugins": [
-    {
-      "type": "cni-bridge-fp",
-      "bridge": "cni-fp",
-      "isGateway": true,
-      "ipMasq": true,
-      "promiscMode": true,
-      "ipam": {
-        "type": "host-local",
-        "ranges": [
-          [{
-            "subnet": "10.88.0.0/16"
-          }],
-          [{
-            "subnet": "2001:4860:4860::/64"
-          }]
-        ],
-        "routes": [
-          { "dst": "0.0.0.0/0" },
-          { "dst": "::/0" }
-        ]
-      },
-      "capabilities": {
-        "io.kubernetes.cri.pod-annotations": true
-      }
-    },
-    {
-      "type": "portmap",
-      "capabilities": {"portMappings": true}
-    }
-  ]
-}
-EOF
-
-cat << EOF | tee /etc/containerd/config.toml
-version = 2
-
-[plugins]
-  [plugins."io.containerd.grpc.v1.cri"]
-    [plugins."io.containerd.grpc.v1.cri".cni]
-      bin_dir = "/usr/lib/cni"
-      conf_dir = "/etc/cni/net.d"
-    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-      runtime_type = "io.containerd.runc.v2"
-    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc-fp]
-      cni_conf_dir = "/etc/cni-fp/net.d"
-      cni_max_conf_num = 1
-      pod_annotations = ["io.containerd.runtime.v2.shim.failpoint.*"]
-      runtime_type = "runc-fp.v1"
-  [plugins."io.containerd.internal.v1.opt"]
-    path = "/var/lib/containerd/opt"
-EOF
-
-systemctl status containerd
-systemctl restart containerd
-systemctl status containerd
-
-DH_GOLANG_BUILDPKG=github.com/containerd/containerd/integration \
-  dh_auto_test -O--buildsystem=golang -O--builddirectory=_build --no-parallel
diff --git a/debian/tests/integration b/debian/tests/integration
deleted file mode 100755
index 6fd5d8e..0000000
--- a/debian/tests/integration
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-# Let integration start containerd daemon
-systemctl stop containerd
-systemctl status containerd || true
-
-dh_auto_configure -O--buildsystem=golang -O--builddirectory=_build
-
-# overlayfs not work in lxc
-find _build/ -name snapshotter_default_linux.go -exec sed -i 's|DefaultSnapshotter = "overlayfs"|DefaultSnapshotter = "native"|g' {} +
-
-DH_GOLANG_BUILDPKG=github.com/containerd/containerd/integration/client \
-  dh_auto_test -O--buildsystem=golang -O--builddirectory=_build -- -c
-
-# criu no permission in lxc testbed
-./_build/client.test -test.v -test.root