Add more integration tests

Signed-off-by: Brian Goff <[email protected]>

.github/workflows/ci.yml

@@ -69,5 +69,4 @@ jobs:
           docker buildx bake \
             --set mariner2-toolchain.cache-from=type=gha,scope=dalec/mariner2-toolchain/ci \
             --set mariner2-toolchain.cache-to=type=gha,scope=dalec/mariner2-toolchain/ci,mode=max \
-            --set runc-mariner2-*.contexts.mariner2-toolchain=target:mariner2-toolchain \
-            test-runc
+            test

docker-bake.hcl

@@ -2,6 +2,10 @@ group "default" {
     targets = ["frontend"]
 }
 
+group "test" {
+    targets = ["test-runc", "test-fixture"]
+}
+
 target "frontend" {
     target = "frontend"
     tags = ["ghcr.io/azure/dalec/frontend:latest", BUILDKIT_SYNTAX]
@@ -66,10 +70,14 @@ target "runc" {
     tags = tgt == "container" ? ["runc:${distro}"] : []
     // only output non-container targets to the fs
     output = tgt != "container" ? ["_output"] : []
+
+    cache-from = ["type=gha,scope=dalec/${distro}/${tgt}"]
+    cache-to = ["type=gha,scope=dalec/${distro}/${tgt},mode=max"]
 }
 
 
 target "test-runc" {
+    name = "test-runc-${distro}"
     matrix = {
         distro = ["mariner2"]
     }
@@ -86,6 +94,20 @@ target "test-runc" {
     EOT
 }
 
-group "test" {
-    targets = ["test-runc"]
-}
+target "test-fixture" {
+    name = "test-fixture-${f}"
+    matrix = {
+        f = ["http-src", "nested", "frontend"]
+        tgt = ["mariner2/rpm"]
+    }
+    contexts = {
+        "mariner2-toolchain" = "target:mariner2-toolchain"
+    }
+    dockerfile = "test/fixtures/${f}.yml"
+    args = {
+        "BUILDKIT_SYNTAX" = BUILDKIT_SYNTAX
+    }
+    target = tgt
+    cache-from = ["type=gha,scope=dalec/${tgt}/${f}"]
+    cache-to = ["type=gha,scope=dalec/${tgt}/${f},mode=max"]
+}

test/fixtures/frontend.yml

@@ -10,10 +10,6 @@ vendor: Microsoft
 packager: Microsoft <[email protected]>
 license: Apache 2.0
 sources:
-  golang:
-    ref: docker-image://golang:1.21
-    path: /usr/local/go
-
   src:
     ref: context://
     filters:
@@ -37,17 +33,21 @@ sources:
           env:
             GOMODCACHE: /build/gomodcache
 
+dependencies:
+  build:
+    golang:
+
 build:
   env:
     GOPROXY: direct
     CGO_ENABLED: 0
     GOGC: off
     GOFLAGS: -trimpath
     GOPATH: /go
+    GOROOT: /usr/lib/golang
   steps:
     - command: |
         export GOMODCACHE="$(pwd)/gomodcache"
-        GOROOT=/usr/lib/golang
         cd src
         go build -o ../frontend ./cmd/frontend
 

test/fixtures/http-src.yml

@@ -0,0 +1,22 @@
+# syntax=ghcr.io/azure/dalec/frontend:latest
+
+name: dalec-test-fixutre-sources
+description: A test fixture for checking build sources
+website: https://www.github.com/Azure/dalec
+version: 0.0.1
+revision: 1
+vendor: Microsoft
+
+packager: Microsoft <[email protected]>
+license: Apache 2.0
+sources:
+  readme:
+    ref: https://raw.githubusercontent.com/moby/buildkit/2677a22857c917168730fe69ad617a50e0d85202/README.md
+  SOMEOTHERNAME.md:
+    ref: https://raw.githubusercontent.com/moby/buildkit/2677a22857c917168730fe69ad617a50e0d85202/README.md
+
+build:
+  steps:
+    - command: |
+        [ -f readme ]
+        [ -f SOMEOTHERNAME.md ]

test/fixtures/nested.yml

@@ -12,7 +12,7 @@ license: Apache 2.0
 noarch: true
 sources:
   src:
-    ref: build://context://frontend/mariner2/test/fixtures/nested
+    ref: build://context://test/fixtures/nested
     build:
       inline: |
         # syntax=docker/dockerfile:1.5