* [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT from docker test
@ 2020-07-27 22:21 Peter Korsgaard
2020-07-27 22:21 ` [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options " Peter Korsgaard
2020-07-31 7:13 ` [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT " Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-07-27 22:21 UTC (permalink / raw)
To: buildroot
Since commit 4f8229653 (package/docker-engine: needs more runtime
dependencies), docker-engine now automatically pulls in cgroupfs-mount, so
drop the explicit handling of it in TestDockerCompose.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
support/testing/tests/package/test_docker_compose.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py
index f12e2a6a3d..67ee795f21 100644
--- a/support/testing/tests/package/test_docker_compose.py
+++ b/support/testing/tests/package/test_docker_compose.py
@@ -20,7 +20,6 @@ class TestDockerCompose(infra.basetest.BRTest):
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}"
BR2_PACKAGE_CA_CERTIFICATES=y
- BR2_PACKAGE_CGROUPFS_MOUNT=y
BR2_PACKAGE_DOCKER_CLI=y
BR2_PACKAGE_DOCKER_COMPOSE=y
BR2_PACKAGE_DOCKER_ENGINE=y
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options from docker test
2020-07-27 22:21 [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT from docker test Peter Korsgaard
@ 2020-07-27 22:21 ` Peter Korsgaard
2020-07-31 7:13 ` Peter Korsgaard
2020-07-31 7:13 ` [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT " Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2020-07-27 22:21 UTC (permalink / raw)
To: buildroot
Since commit 0390777bfaff6c6 (package/docker-engine: needs some kernel
options), docker-engine now automatically ensures the needed kernel options
are enabled, so drop the explicit options from the kernel config.
23:19:27 TestDockerCompose Starting
23:19:28 TestDockerCompose Building
00:14:41 TestDockerCompose Building done
00:15:30 TestDockerCompose Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 3362.784s
OK
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
.../testing/conf/docker-compose-kernel.config | 26 -------------------
1 file changed, 26 deletions(-)
diff --git a/support/testing/conf/docker-compose-kernel.config b/support/testing/conf/docker-compose-kernel.config
index 9468ef8db8..4d30a578ec 100644
--- a/support/testing/conf/docker-compose-kernel.config
+++ b/support/testing/conf/docker-compose-kernel.config
@@ -1,16 +1,7 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_HIGH_RES_TIMERS=y
-CONFIG_CGROUPS=y
-CONFIG_MEMCG=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_IOSF_MBI=y
@@ -38,33 +29,19 @@ CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=y
# CONFIG_NF_CONNTRACK_PROCFS is not set
# CONFIG_NF_CT_PROTO_DCCP is not set
# CONFIG_NF_CT_PROTO_SCTP is not set
# CONFIG_NF_CT_PROTO_UDPLITE is not set
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_IPVS=y
CONFIG_IP_VS=y
CONFIG_IP_VS_RR=y
CONFIG_IP_VS_NFCT=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_BRIDGE=y
# CONFIG_BRIDGE_IGMP_SNOOPING is not set
# CONFIG_WIRELESS is not set
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_VIRTIO_BLK=y
CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_MACVLAN=y
-CONFIG_VXLAN=y
-CONFIG_VETH=y
CONFIG_VIRTIO_NET=y
# CONFIG_ETHERNET is not set
# CONFIG_WLAN is not set
@@ -90,12 +67,9 @@ CONFIG_VIRTIO_PCI=y
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT4_FS=y
-CONFIG_OVERLAY_FS=y
-CONFIG_OVERLAY_FS_REDIRECT_DIR=y
CONFIG_TMPFS=y
# CONFIG_MISC_FILESYSTEMS is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_KEYS=y
CONFIG_SECURITYFS=y
# CONFIG_CRYPTO_ECHAINIV is not set
# CONFIG_CRYPTO_HW is not set
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options from docker test
2020-07-27 22:21 ` [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options " Peter Korsgaard
@ 2020-07-31 7:13 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-07-31 7:13 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> Since commit 0390777bfaff6c6 (package/docker-engine: needs some kernel
> options), docker-engine now automatically ensures the needed kernel options
> are enabled, so drop the explicit options from the kernel config.
> 23:19:27 TestDockerCompose Starting
> 23:19:28 TestDockerCompose Building
> 00:14:41 TestDockerCompose Building done
> 00:15:30 TestDockerCompose Cleaning up
> .
> ----------------------------------------------------------------------
> Ran 1 test in 3362.784s
> OK
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT from docker test
2020-07-27 22:21 [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT from docker test Peter Korsgaard
2020-07-27 22:21 ` [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options " Peter Korsgaard
@ 2020-07-31 7:13 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-07-31 7:13 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> Since commit 4f8229653 (package/docker-engine: needs more runtime
> dependencies), docker-engine now automatically pulls in cgroupfs-mount, so
> drop the explicit handling of it in TestDockerCompose.
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-31 7:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-27 22:21 [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT from docker test Peter Korsgaard
2020-07-27 22:21 ` [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options " Peter Korsgaard
2020-07-31 7:13 ` Peter Korsgaard
2020-07-31 7:13 ` [Buildroot] [PATCH 1/2] support/testing: drop explicit CGROUPFS_MOUNT " Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox