support/testing: drop explicit CGROUPFS_MOUNT from docker test
PATCH 1/2 support/testing: drop explicit CGROUPFS_MOUNT from docker test
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.
--- support/testing/tests/package/test_docker_compose.py | 1 - 1 file changed, 1 deletion(-)
support/testing/tests/package/test_docker_compose.py +0 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 1/2 support/testing: drop explicit CGROUPFS_MOUNT from docker test
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> 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 <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 support/testing: drop explicit docker kernel options from docker test
In reply to Peter KorsgaardSince 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
--- .../testing/conf/docker-compose-kernel.config | 26 ------------------- 1 file changed, 26 deletions(-)
support/testing/conf/docker-compose-kernel.config +0 -26
@@ -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
Signature · 1 line
2.20.1
PATCH 2/2 support/testing: drop explicit docker kernel options from docker test
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> 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
Quoted 7 lines
.
----------------------------------------------------------------------
Ran 1 test in 3362.784sOK
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard