diff --git a/examples/composable-packages/zarf.yaml b/examples/composable-packages/zarf.yaml index 35dab0b33e..2a446df01e 100644 --- a/examples/composable-packages/zarf.yaml +++ b/examples/composable-packages/zarf.yaml @@ -31,7 +31,7 @@ components: # default: false # the initial value overrides the child component import: # The URL to the skeleton package containing this component's package definition - url: oci://🦄/dos-games:1.0.0 + url: oci://ghcr.io/zarf-dev/dos-games:1.0.0 # Example optional custom name to point to in the imported package (default is to use this component's name) name: baseline # Un'name'd Zarf primitives will be appended to the end of the primitive's list for that component. diff --git a/src/test/e2e/06_create_sbom_test.go b/src/test/e2e/06_create_sbom_test.go index 75b1b309ff..4fda984d96 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-docker.io_defenseunicorns_zarf-game_multi-tile-dark.html")) + require.FileExists(t, filepath.Join(sbomPath, "dos-games", "sbom-viewer-docker.io_defenseunicorns_zarf-game_0.0.1.html")) require.FileExists(t, filepath.Join(sbomPath, "dos-games", "compare.html")) - require.FileExists(t, filepath.Join(sbomPath, "dos-games", "docker.io_defenseunicorns_zarf-game_multi-tile-dark.json")) + require.FileExists(t, filepath.Join(sbomPath, "dos-games", "docker.io_defenseunicorns_zarf-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-docker.io_defenseunicorns_zarf-game_multi-tile-dark.html")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-docker.io_defenseunicorns_zarf-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", "docker.io_defenseunicorns_zarf-game_multi-tile-dark.json")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "docker.io_defenseunicorns_zarf-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, "- defenseunicorns/zarf-game:multi-tile-dark\n", stdOut) + require.Equal(t, "- defenseunicorns/zarf-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-docker.io_defenseunicorns_zarf-game_multi-tile-dark.html")) + _, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-docker.io_defenseunicorns_zarf-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/e2e/09_component_compose_test.go b/src/test/e2e/09_component_compose_test.go index 37a905456a..1c821ee3d2 100644 --- a/src/test/e2e/09_component_compose_test.go +++ b/src/test/e2e/09_component_compose_test.go @@ -61,7 +61,7 @@ func (suite *CompositionSuite) Test_0_ComposabilityExample() { // Ensure that the action was appended suite.Contains(stdErr, ` - - defenseunicorns/zarf-game:multi-tile-dark + - defenseunicorns/zarf-game:0.0.1 actions: onDeploy: before: diff --git a/src/test/e2e/12_lint_test.go b/src/test/e2e/12_lint_test.go index 6b7239a17a..3fabfa631d 100644 --- a/src/test/e2e/12_lint_test.go +++ b/src/test/e2e/12_lint_test.go @@ -46,7 +46,7 @@ func TestLint(t *testing.T) { // Testing import / compose + variables are working require.Contains(t, strippedStderr, ".components.[2].images.[3] | Image not pinned with digest - busybox:latest") // Testing OCI imports get linted - require.Contains(t, strippedStderr, ".components.[0].images.[0] | Image not pinned with digest - defenseunicorns/zarf-game:multi-tile-dark") + require.Contains(t, strippedStderr, ".components.[0].images.[0] | Image not pinned with digest - defenseunicorns/zarf-game:0.0.1") // Check flavors require.NotContains(t, strippedStderr, "image-in-bad-flavor-component:unpinned") diff --git a/src/test/packages/12-lint/linted-import/zarf.yaml b/src/test/packages/12-lint/linted-import/zarf.yaml index 4a99f73e96..1ee7d7547c 100644 --- a/src/test/packages/12-lint/linted-import/zarf.yaml +++ b/src/test/packages/12-lint/linted-import/zarf.yaml @@ -19,5 +19,5 @@ components: - name: oci-games-url import: - url: oci://🦄/dos-games:1.0.0 + url: oci://ghcr.io/zarf-dev/dos-games:1.0.0 name: baseline diff --git a/src/test/packages/12-lint/zarf.yaml b/src/test/packages/12-lint/zarf.yaml index a77e3f89c9..bb4ac638fc 100644 --- a/src/test/packages/12-lint/zarf.yaml +++ b/src/test/packages/12-lint/zarf.yaml @@ -32,7 +32,7 @@ components: - name: oci-games-url import: - url: oci://🦄/dos-games:1.0.0 + url: oci://ghcr.io/zarf-dev/dos-games:1.0.0 name: baseline - name: oci-games-url 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 7b138261fd..054d0be18f 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: "defenseunicorns/zarf-game:multi-tile-dark" + image: "ghcr.io/zarf-dev/zarf-game:0.0.1" ports: - name: http containerPort: 8000 diff --git a/src/test/packages/25-evil-dos-games/zarf.yaml b/src/test/packages/25-evil-dos-games/zarf.yaml index 41ecd44716..4ab0f2311f 100644 --- a/src/test/packages/25-evil-dos-games/zarf.yaml +++ b/src/test/packages/25-evil-dos-games/zarf.yaml @@ -13,4 +13,4 @@ components: - manifests/evil-deployment.yaml - manifests/service.yaml images: - - defenseunicorns/zarf-game:multi-tile-dark + - defenseunicorns/zarf-game:0.0.1 diff --git a/src/test/packages/25-manifest-adoption/deployment.yaml b/src/test/packages/25-manifest-adoption/deployment.yaml index 9cd8c5b754..7625f1a3e6 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: "defenseunicorns/zarf-game:multi-tile-dark" + image: "ghcr.io/zarf-dev/zarf-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 06131de09b..14e052c2cb 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: - - defenseunicorns/zarf-game:multi-tile-dark - - defenseunicorns/zarf-game:multi-tile-dark@sha256:f78e442f0f3eb3e9459b5ae6b1a8fda62f8dfe818112e7d130a4e8ae72b3cbff - - defenseunicorns/zarf-game@sha256:f78e442f0f3eb3e9459b5ae6b1a8fda62f8dfe818112e7d130a4e8ae72b3cbff + - ghcr.io/zarf-dev/zarf-game:0.0.1 + - ghcr.io/zarf-dev/zarf-game:0.0.1@sha256:0a44b759e219d9d6f3c7cbbf40c57ede71a1f9bf54da65767c4137be74727662 + - ghcr.io/zarf-dev/zarf-game@sha256:0a44b759e219d9d6f3c7cbbf40c57ede71a1f9bf54da65767c4137be74727662