From ba697656d018fb47b49ac076ccd9443697b41f84 Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Wed, 7 Aug 2024 16:44:53 +0000 Subject: [PATCH] zarf-game to doom game Signed-off-by: Austin Abro --- examples/dos-games/image/Dockerfile | 2 +- examples/dos-games/manifests/deployment.yaml | 2 +- examples/dos-games/zarf.yaml | 2 +- src/test/e2e/06_create_sbom_test.go | 12 ++++++------ .../25-evil-dos-games/manifests/evil-deployment.yaml | 2 +- .../packages/25-manifest-adoption/deployment.yaml | 2 +- src/test/packages/26-image-dos-games/zarf.yaml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/dos-games/image/Dockerfile b/examples/dos-games/image/Dockerfile index aa727f5ca6..80c94dc5e8 100644 --- a/examples/dos-games/image/Dockerfile +++ b/examples/dos-games/image/Dockerfile @@ -24,4 +24,4 @@ COPY --from=0 /binary /binary WORKDIR /site ENTRYPOINT ["/binary/darkhttpd", "/site", "--port", "8000"] -# docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/zarf-dev/zarf-game:0.0.1 . +# docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/zarf-dev/doom-game:0.0.1 . diff --git a/examples/dos-games/manifests/deployment.yaml b/examples/dos-games/manifests/deployment.yaml index 4de8821afe..1b3fa7733a 100644 --- a/examples/dos-games/manifests/deployment.yaml +++ b/examples/dos-games/manifests/deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: multi-game - image: ghcr.io/zarf-dev/zarf-game:0.0.1 + image: ghcr.io/zarf-dev/doom-game:0.0.1 ports: - name: http containerPort: 8000 diff --git a/examples/dos-games/zarf.yaml b/examples/dos-games/zarf.yaml index e8213093f1..49d49f5be8 100644 --- a/examples/dos-games/zarf.yaml +++ b/examples/dos-games/zarf.yaml @@ -14,7 +14,7 @@ components: - manifests/deployment.yaml - manifests/service.yaml images: - - ghcr.io/zarf-dev/zarf-game:0.0.1 + - ghcr.io/zarf-dev/doom-game:0.0.1 actions: onDeploy: after: diff --git a/src/test/e2e/06_create_sbom_test.go b/src/test/e2e/06_create_sbom_test.go index 28bf604983..26890ccaf9 100644 --- a/src/test/e2e/06_create_sbom_test.go +++ b/src/test/e2e/06_create_sbom_test.go @@ -24,9 +24,9 @@ func TestCreateSBOM(t *testing.T) { require.NoError(t, err, stdOut, stdErr) require.Contains(t, stdErr, "Creating SBOMs for 1 images and 0 components with files.") // Test that the game package generates the SBOMs we expect (images only) - require.FileExists(t, filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_zarf-game_0.0.1.html")) + require.FileExists(t, filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_doom-game_0.0.1.html")) require.FileExists(t, filepath.Join(sbomPath, "dos-games", "compare.html")) - require.FileExists(t, filepath.Join(sbomPath, "dos-games", "ghcr.io_zarf-dev_zarf-game_0.0.1.json")) + require.FileExists(t, filepath.Join(sbomPath, "dos-games", "ghcr.io_zarf-dev_doom-game_0.0.1.json")) // Clean the SBOM path so it is force to be recreated e2e.CleanFiles(sbomPath) @@ -34,16 +34,16 @@ func TestCreateSBOM(t *testing.T) { stdOut, stdErr, err = e2e.Zarf(t, "package", "inspect", pkgName, "--sbom-out", sbomPath) require.NoError(t, err, stdOut, stdErr) // Test that the game package generates the SBOMs we expect (images only) - _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_zarf-game_0.0.1.html")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_doom-game_0.0.1.html")) require.NoError(t, err) _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "compare.html")) require.NoError(t, err) - _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "ghcr.io_zarf-dev_zarf-game_0.0.1.json")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "ghcr.io_zarf-dev_doom-game_0.0.1.json")) require.NoError(t, err) stdOut, _, err = e2e.Zarf(t, "package", "inspect", pkgName, "--list-images") require.NoError(t, err) - require.Equal(t, "- ghcr.io/zarf-dev/zarf-game:0.0.1\n", stdOut) + require.Equal(t, "- ghcr.io/zarf-dev/doom-game:0.0.1\n", stdOut) // Pull the current zarf binary version to find the corresponding init package version, stdErr, err := e2e.Zarf(t, "version") @@ -54,7 +54,7 @@ func TestCreateSBOM(t *testing.T) { stdOut, stdErr, err = e2e.Zarf(t, "package", "inspect", initName, "--sbom-out", sbomPath) require.NoError(t, err, stdOut, stdErr) // Test that we preserve the filepath - _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_zarf-game_0.0.1.html")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_doom-game_0.0.1.html")) require.NoError(t, err) // Test that the init package generates the SBOMs we expect (images + component files) _, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-docker.io_gitea_gitea_1.21.5-rootless.html")) diff --git a/src/test/packages/25-evil-dos-games/manifests/evil-deployment.yaml b/src/test/packages/25-evil-dos-games/manifests/evil-deployment.yaml index 054d0be18f..1bc9cca00f 100644 --- a/src/test/packages/25-evil-dos-games/manifests/evil-deployment.yaml +++ b/src/test/packages/25-evil-dos-games/manifests/evil-deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: multi-game - image: "ghcr.io/zarf-dev/zarf-game:0.0.1" + image: "ghcr.io/zarf-dev/doom-game:0.0.1" ports: - name: http containerPort: 8000 diff --git a/src/test/packages/25-manifest-adoption/deployment.yaml b/src/test/packages/25-manifest-adoption/deployment.yaml index 7625f1a3e6..539b42ef64 100644 --- a/src/test/packages/25-manifest-adoption/deployment.yaml +++ b/src/test/packages/25-manifest-adoption/deployment.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: multi-game - image: "ghcr.io/zarf-dev/zarf-game:0.0.1" + image: "ghcr.io/zarf-dev/doom-game:0.0.1" ports: - name: http containerPort: 8000 diff --git a/src/test/packages/26-image-dos-games/zarf.yaml b/src/test/packages/26-image-dos-games/zarf.yaml index 14e052c2cb..d09bd48d00 100644 --- a/src/test/packages/26-image-dos-games/zarf.yaml +++ b/src/test/packages/26-image-dos-games/zarf.yaml @@ -7,6 +7,6 @@ components: - name: baseline required: true images: - - ghcr.io/zarf-dev/zarf-game:0.0.1 - - ghcr.io/zarf-dev/zarf-game:0.0.1@sha256:0a44b759e219d9d6f3c7cbbf40c57ede71a1f9bf54da65767c4137be74727662 + - ghcr.io/zarf-dev/doom-game:0.0.1 + - ghcr.io/zarf-dev/doom-game:0.0.1@sha256:0a44b759e219d9d6f3c7cbbf40c57ede71a1f9bf54da65767c4137be74727662 - ghcr.io/zarf-dev/zarf-game@sha256:0a44b759e219d9d6f3c7cbbf40c57ede71a1f9bf54da65767c4137be74727662