create integration-tests bake target

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

docker-bake.hcl

@@ -14,6 +14,30 @@ variable "BUILDKITD_TAGS" {
   default = null
 }
 
+variable "HTTP_PROXY" {
+  default = null
+}
+
+variable "HTTPS_PROXY" {
+  default = null
+}
+
+variable "NO_PROXY" {
+  default = null
+}
+
+variable "GOBUILDFLAGS" {
+  default = null
+}
+
+variable "VERIFYFLAGS" {
+  default = null
+}
+
+variable "CGO_ENABLED" {
+  default = null
+}
+
 # Defines the output folder
 variable "DESTDIR" {
   default = ""
@@ -28,6 +52,13 @@ target "_common" {
     ALPINE_VERSION = ALPINE_VERSION
     GO_VERSION = GO_VERSION
     NODE_VERSION = NODE_VERSION
+    BUILDKITD_TAGS = BUILDKITD_TAGS
+    HTTP_PROXY = HTTP_PROXY
+    HTTPS_PROXY = HTTPS_PROXY
+    NO_PROXY = NO_PROXY
+    GOBUILDFLAGS = GOBUILDFLAGS
+    VERIFYFLAGS = VERIFYFLAGS
+    CGO_ENABLED = CGO_ENABLED
     BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
   }
 }
@@ -39,9 +70,6 @@ group "default" {
 target "binaries" {
   inherits = ["_common"]
   target = "binaries"
-  args = {
-    BUILDKITD_TAGS = BUILDKITD_TAGS
-  }
   output = [bindir("build")]
 }
 
@@ -74,6 +102,11 @@ target "integration-tests-base" {
   output = ["type=cacheonly"]
 }
 
+target "integration-tests" {
+  inherits = ["integration-tests-base"]
+  target = "integration-tests"
+}
+
 group "validate" {
   targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-shfmt", "validate-docs"]
 }

hack/test

@@ -4,9 +4,13 @@
 set -eu -o pipefail
 
 : "${GO_VERSION=}"
+: "${BUILDKITD_TAGS=}"
 : "${HTTP_PROXY=}"
 : "${HTTPS_PROXY=}"
 : "${NO_PROXY=}"
+: "${GOBUILDFLAGS=}"
+: "${VERIFYFLAGS=}"
+: "${CGO_ENABLED=}"
 
 : "${TEST_IMAGE_BUILD=1}"
 : "${TEST_IMAGE_ID=buildkit-tests}"
@@ -18,12 +22,8 @@ set -eu -o pipefail
 : "${TEST_REPORT_SUFFIX=}"
 : "${TEST_KEEP_CACHE=}"
 
-: "${GOBUILDFLAGS=}"
-: "${VERIFYFLAGS=}"
-: "${CGO_ENABLED=}"
 : "${DOCKERFILE_RELEASES=}"
 : "${BUILDKIT_WORKER_RANDOM=}"
-: "${BUILDKITD_TAGS=}"
 
 if [ "$TEST_DOCKERD" == "1" ]; then
   if [ ! -f "$TEST_DOCKERD_BINARY" ]; then