buildx: handle new fields for inspect output

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-16 22:28:07 +02:00
parent 495c96b050
commit ab02f62089
6 changed files with 400 additions and 25 deletions
--- a/tests/fixtures/inspect10.txt
+++ b/tests/fixtures/inspect10.txt
@@ -0,0 +1,67 @@
+Name:          remote-builder
+Driver:        remote
+Last Activity: 2023-04-20 12:47:49 +0000 UTC
+
+Nodes:
+Name:      remote-builder0
+Endpoint:  docker-container://buildx_buildkit_dk-remote-builder0
+Status:    inactive
+Platforms:
+
+Name:           aws_graviton2
+Endpoint:       tcp://10.0.0.1:1234
+Driver Options: cacert="/home/user/.certs/aws_graviton2/ca.pem" cert="/home/user/.certs/aws_graviton2/cert.pem" key="/home/user/.certs/aws_graviton2/key.pem"
+Status:         running
+Buildkit:       v0.11.6
+Platforms:      darwin/arm64*, linux/arm64*, linux/arm/v5*, linux/arm/v6*, linux/arm/v7*, windows/arm64*
+Labels:
+ org.mobyproject.buildkit.worker.executor:         oci
+ org.mobyproject.buildkit.worker.hostname:         77ebc22e2d82
+ org.mobyproject.buildkit.worker.network:          host
+ org.mobyproject.buildkit.worker.oci.process-mode: sandbox
+ org.mobyproject.buildkit.worker.selinux.enabled:  false
+ org.mobyproject.buildkit.worker.snapshotter:      overlayfs
+GC Policy rule#0:
+ All:           false
+ Filters:       type==source.local,type==exec.cachemount,type==source.git.checkout
+ Keep Duration: 48h0m0s
+ Keep Bytes:    488.3MiB
+GC Policy rule#1:
+ All:           false
+ Keep Duration: 1440h0m0s
+ Keep Bytes:    23.28GiB
+GC Policy rule#2:
+ All:        false
+ Keep Bytes: 23.28GiB
+GC Policy rule#3:
+ All:        true
+ Keep Bytes: 23.28GiB
+
+Name:           linuxone_s390x
+Endpoint:       tcp://10.0.0.2:1234
+Driver Options: cacert="/home/user/.certs/linuxone_s390x/ca.pem" cert="/home/user/.certs/linuxone_s390x/cert.pem" key="/home/user/.certs/linuxone_s390x/key.pem"
+Status:         running
+Buildkit:       v0.11.6
+Platforms:      linux/s390x*
+Labels:
+ org.mobyproject.buildkit.worker.executor:         oci
+ org.mobyproject.buildkit.worker.hostname:         9d0d62a96818
+ org.mobyproject.buildkit.worker.network:          host
+ org.mobyproject.buildkit.worker.oci.process-mode: sandbox
+ org.mobyproject.buildkit.worker.selinux.enabled:  false
+ org.mobyproject.buildkit.worker.snapshotter:      overlayfs
+GC Policy rule#0:
+ All:           false
+ Filters:       type==source.local,type==exec.cachemount,type==source.git.checkout
+ Keep Duration: 48h0m0s
+ Keep Bytes:    488.3MiB
+GC Policy rule#1:
+ All:           false
+ Keep Duration: 1440h0m0s
+ Keep Bytes:    9.313GiB
+GC Policy rule#2:
+ All:        false
+ Keep Bytes: 9.313GiB
+GC Policy rule#3:
+ All:        true
+ Keep Bytes: 9.313GiB
--- a/tests/fixtures/inspect8.txt
+++ b/tests/fixtures/inspect8.txt
@@ -0,0 +1,34 @@
+Name:          builder-52aa0611-faf0-42ac-a940-461e4e287d68
+Driver:        docker-container
+Last Activity: 2023-06-13 13:52:31 +0000 UTC
+
+Nodes:
+Name:           builder-52aa0611-faf0-42ac-a940-461e4e287d680
+Endpoint:       unix:///var/run/docker.sock
+Driver Options: image="moby/buildkit:buildx-stable-1" network="host"
+Status:         running
+Flags:          --debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
+Buildkit:       v0.11.6
+Platforms:      linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/amd64/v4, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6
+Labels:
+ org.mobyproject.buildkit.worker.executor:         oci
+ org.mobyproject.buildkit.worker.hostname:         fv-az572-38
+ org.mobyproject.buildkit.worker.network:          host
+ org.mobyproject.buildkit.worker.oci.process-mode: sandbox
+ org.mobyproject.buildkit.worker.selinux.enabled:  false
+ org.mobyproject.buildkit.worker.snapshotter:      overlayfs
+GC Policy rule#0:
+ All:           false
+ Filters:       type==source.local,type==exec.cachemount,type==source.git.checkout
+ Keep Duration: 48h0m0s
+ Keep Bytes:    488.3MiB
+GC Policy rule#1:
+ All:           false
+ Keep Duration: 1440h0m0s
+ Keep Bytes:    8.382GiB
+GC Policy rule#2:
+ All:        false
+ Keep Bytes: 8.382GiB
+GC Policy rule#3:
+ All:        true
+ Keep Bytes: 8.382GiB
--- a/tests/fixtures/inspect9.txt
+++ b/tests/fixtures/inspect9.txt
@@ -0,0 +1,14 @@
+Name:          default
+Driver:        docker
+Last Activity: 2023-06-13 18:13:43 +0000 UTC
+
+Nodes:
+Name:      default
+Endpoint:  default
+Status:    running
+Buildkit:  v0.11.7-0.20230525183624-798ad6b0ce9f
+Platforms: linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6
+GC Policy rule#0:
+ All:        true
+ Filters:
+ Keep Bytes: 100GiB