test: decrease reliance on dockerhub

src/test/e2e/04_create_templating_test.go

@@ -21,15 +21,14 @@ func TestCreateTemplating(t *testing.T) {
 	decompressPath := filepath.Join(tmpdir, ".package-decompressed")
 	sbomPath := filepath.Join(tmpdir, ".sbom-location")
 
-	pkgName := fmt.Sprintf("zarf-package-variables-%s.tar.zst", e2e.Arch)
+	pkgName := fmt.Sprintf("zarf-package-templating-%s.tar.zst", e2e.Arch)
 
 	// Test that not specifying a package variable results in an error
-	_, stdErr, _ := e2e.Zarf(t, "package", "create", "examples/variables", "--confirm")
-	expectedOutString := "variable 'NGINX_VERSION' must be '--set' when using the '--confirm' flag"
-	require.Contains(t, stdErr, "", expectedOutString)
+	_, _, err := e2e.Zarf(t, "package", "create", "src/test/packages/04-templating", "--confirm")
+	require.Error(t, err)
 
 	// Test a simple package variable example with `--set` (will fail to pull an image if this is not set correctly)
-	stdOut, stdErr, err := e2e.Zarf(t, "package", "create", "examples/variables", "--set", "NGINX_VERSION=1.23.3", "--confirm")
+	stdOut, stdErr, err := e2e.Zarf(t, "package", "create", "src/test/packages/04-templating", "--set", "PODINFO_VERSION=6.4.0", "--confirm")
 	require.NoError(t, err, stdOut, stdErr)
 
 	stdOut, stdErr, err = e2e.Zarf(t, "t", "archiver", "decompress", pkgName, decompressPath, "--unarchive-all")
@@ -38,7 +37,7 @@ func TestCreateTemplating(t *testing.T) {
 	// Check that the constant in the zarf.yaml is replaced correctly
 	builtConfig, err := os.ReadFile(decompressPath + "/zarf.yaml")
 	require.NoError(t, err)
-	require.Contains(t, string(builtConfig), "name: NGINX_VERSION\n  value: 1.23.3")
+	require.Contains(t, string(builtConfig), "name: PODINFO_VERSION\n  value: 6.4.0")
 
 	// Test that files and file folders template and handle SBOMs correctly
 	stdOut, stdErr, err = e2e.Zarf(t, "package", "create", "src/test/packages/04-file-folders-templating-sbom/", "--sbom-out", sbomPath, "--confirm")

src/test/e2e/13_find_images_test.go

@@ -51,17 +51,19 @@ func TestFindImages(t *testing.T) {
 		registry := "coolregistry.gov"
 		agentTag := "test"
 
-		stdOut, _, err := e2e.Zarf(t, "prepare", "find-images", ".", "--registry-url", registry, "--create-set", fmt.Sprintf("agent_image_tag=%s", agentTag))
+		stdOut, _, err := e2e.Zarf(t, "dev", "find-images", ".", "--registry-url", registry, "--create-set", fmt.Sprintf("agent_image_tag=%s", agentTag), "--skip-cosign")
+
 		require.NoError(t, err)
 		internalRegistryImage := fmt.Sprintf("%s/%s:%s", registry, "zarf-dev/zarf/agent", agentTag)
-		require.Contains(t, stdOut, internalRegistryImage, "registry image should be found with registry url")
-		require.Contains(t, stdOut, "busybox:latest", "Busybox image should be found as long as helm chart doesn't error")
+		require.Contains(t, stdOut, internalRegistryImage)
+		// busybox image is in git init package
+		require.Contains(t, stdOut, "busybox:latest")
 
-		path := filepath.Join("src", "test", "packages", "00-find-images-with-vars")
-		stdOut, _, err = e2e.Zarf(t, "prepare", "find-images", path, "--deploy-set", "BUSYBOX_IMAGE=busybox:earliest")
+		path := filepath.Join("src", "test", "packages", "13-find-images-with-vars")
+		stdOut, _, err = e2e.Zarf(t, "dev", "find-images", path, "--deploy-set", "PODINFO_IMAGE=cool-image.com/agent:latest", "--skip-cosign")
 		require.NoError(t, err)
-		require.Contains(t, stdOut, "nginx:latest", "Manifests aren't interpreting vars")
-		require.Contains(t, stdOut, "busybox:earliest", "Values files aren't interpreting vars")
+		require.Contains(t, stdOut, "ghcr.io/zarf-dev/zarf/agent:v0.36.1")
+		require.Contains(t, stdOut, "cool-image.com/agent:latest")
 	})
 
 	t.Run("zarf test find images --why w/ helm chart success", func(t *testing.T) {

src/test/packages/04-templating/zarf.yaml

@@ -0,0 +1,14 @@
+kind: ZarfPackageConfig
+metadata:
+  name: templating
+
+constants:
+  - name: PODINFO_VERSION
+    value: "###ZARF_PKG_TMPL_PODINFO_VERSION###"
+    pattern: "^[\\w\\-\\.]+$"
+
+components:
+  - name: variables-with-podinfo
+    images:
+      # This sets the nginx image tag to the same PKG_TMPL used for the constant above to keep the zarf.yaml and nginx-deployment.yaml in sync
+      - "ghcr.io/stefanprodan/podinfo:###ZARF_PKG_TMPL_PODINFO_VERSION###"

src/test/packages/00-find-images-with-vars/deployment.yaml → src/test/packages/13-find-images-with-vars/deployment.yaml

@@ -16,4 +16,4 @@ spec:
     spec:
       containers:
         - name: server
-          image: "###ZARF_CONST_SAMPLE_IMAGE###"
+          image: "###ZARF_CONST_AGENT_IMAGE###"

src/test/packages/00-find-images-with-vars/simple-helm/templates/deployment.yaml → src/test/packages/13-find-images-with-vars/simple-helm/templates/deployment.yaml

@@ -15,5 +15,5 @@ spec:
         app: simple-deployment
     spec:
       containers:
-        - name: busybox
-          image: {{.Values.busybox}}
+        - name: podinfo
+          image: {{.Values.podinfo}}

src/test/packages/13-find-images-with-vars/values.yaml

@@ -0,0 +1 @@
+podinfo: ###ZARF_VAR_PODINFO_IMAGE###

src/test/packages/00-find-images-with-vars/zarf.yaml → src/test/packages/13-find-images-with-vars/zarf.yaml

@@ -4,12 +4,12 @@ metadata:
   description: Simple zarf package with variables
 
 variables:
-  - name: BUSYBOX_IMAGE
-    default: "busybox:latest"
+  - name: PODINFO_IMAGE
+    default: "ghcr.io/stefanprodan/podinfo:latest"
 
 constants:
-  - name: SAMPLE_IMAGE
-    value: "nginx:latest"
+  - name: AGENT_IMAGE
+    value: "ghcr.io/zarf-dev/zarf/agent:v0.36.1"
 
 components:
 - name: simple-var

src/test/packages/28-helm-no-wait/never-ready.pod.yaml

@@ -4,8 +4,8 @@ metadata:
   name: never-ready-zarf-wait-test
 spec:
   containers:
-  - name: alpine
-    image: alpine:latest
+  - name: podinfo
+    image: ghcr.io/stefanprodan/podinfo:6.4.0
     command:
       - "sleep"
       - "infinity"

src/test/packages/28-helm-no-wait/zarf.yaml

@@ -13,4 +13,4 @@ components:
         files:
           - never-ready.pod.yaml
     images:
-      - alpine:latest
+      - ghcr.io/stefanprodan/podinfo:6.4.0