Skip to content

Commit

Permalink
Rename image references in test to zarf-dev org
Browse files Browse the repository at this point in the history
Signed-off-by: Philip Laine <[email protected]>
  • Loading branch information
phillebaba committed Jul 18, 2024
1 parent 7bf5b4d commit b9133f5
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-application-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
ref: ${{ github.event.inputs.branchName }}

- name: Install The Latest Release Version of Zarf
uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
uses: defenseunicorns/setup-zarf@10e539efed02f75ec39eb8823e22a5c795f492ae #v1.0.1

- name: "Login to GHCR"
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
chmod +x build/zarf
- name: Install release version of Zarf
uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
uses: defenseunicorns/setup-zarf@10e539efed02f75ec39eb8823e22a5c795f492ae #v1.0.1
with:
download-init-package: true

Expand Down
2 changes: 1 addition & 1 deletion src/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

// Zarf Global Configuration Constants.
const (
GithubProject = "defenseunicorns/zarf"
GithubProject = "zarf-dev/zarf"

ZarfAgentHost = "agent-hook.zarf.svc"

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/zoci/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ func ReferenceFromMetadata(registryLocation string, metadata *types.ZarfMetadata

// GetInitPackageURL returns the URL for the init package for the given version.
func GetInitPackageURL(version string) string {
return fmt.Sprintf("ghcr.io/defenseunicorns/packages/init:%s", version)
return fmt.Sprintf("ghcr.io/zarf-dev/packages/init:%s", version)
}
2 changes: 1 addition & 1 deletion src/test/e2e/08_create_differential_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestCreateDifferential(t *testing.T) {
/* Validate we have ONLY the images we expect to have */
expectedImages := []string{
"ghcr.io/stefanprodan/podinfo:latest",
"ghcr.io/defenseunicorns/zarf/agent:v0.26.0",
"ghcr.io/zarf-dev/zarf/agent:v0.26.0",
}
require.Len(t, actualImages, 2, "zarf.yaml from the differential package does not contain the correct number of images")
for _, expectedImage := range expectedImages {
Expand Down
4 changes: 2 additions & 2 deletions src/test/e2e/11_oci_pull_inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (suite *PullInspectTestSuite) Test_0_Pull() {
out := fmt.Sprintf("zarf-package-dos-games-%s-1.0.0.tar.zst", e2e.Arch)

// Build the fully qualified reference.
ref := fmt.Sprintf("oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0-%s", e2e.Arch)
ref := fmt.Sprintf("oci://ghcr.io/zarf-dev/packages/dos-games:1.0.0-%s", e2e.Arch)

// Pull the package via OCI.
stdOut, stdErr, err := e2e.Zarf("package", "pull", ref)
Expand Down Expand Up @@ -74,7 +74,7 @@ func (suite *PullInspectTestSuite) Test_1_Remote_Inspect() {

// Test inspect on a public package.
// NOTE: This also makes sure that Zarf does not attempt auth when inspecting a public package.
ref := fmt.Sprintf("oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0-%s", e2e.Arch)
ref := fmt.Sprintf("oci://ghcr.io/zarf-dev/packages/dos-games:1.0.0-%s", e2e.Arch)
_, stdErr, err = e2e.Zarf("package", "inspect", ref)
suite.NoError(err, stdErr)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/13_find_images_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestFindImages(t *testing.T) {

stdOut, _, err := e2e.Zarf("prepare", "find-images", ".", "--registry-url", registry, "--create-set", fmt.Sprintf("agent_image_tag=%s", agentTag))
require.NoError(t, err)
internalRegistryImage := fmt.Sprintf("%s/%s:%s", registry, "defenseunicorns/zarf/agent", agentTag)
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")

Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/14_create_sha_index_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestCreateIndexShaErrors(t *testing.T) {
{
name: "Image Index",
packagePath: "src/test/packages/14-index-sha/image-index",
expectedImageInStderr: "ghcr.io/defenseunicorns/zarf/agent:v0.32.6@sha256:b3fabdc7d4ecd0f396016ef78da19002c39e3ace352ea0ae4baa2ce9d5958376",
expectedImageInStderr: "ghcr.io/zarf-dev/zarf/agent:v0.32.6@sha256:b3fabdc7d4ecd0f396016ef78da19002c39e3ace352ea0ae4baa2ce9d5958376",
},
{
name: "Manifest List",
Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/21_connect_creds_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func connectToZarfServices(ctx context.Context, t *testing.T) {
// We assert greater than or equal to since the base init has 8 images
// HOWEVER during an upgrade we could have mismatched versions/names resulting in more images
require.GreaterOrEqual(t, len(registryList), 3)
require.Contains(t, stdOut, "defenseunicorns/zarf/agent")
require.Contains(t, stdOut, "zarf-dev/zarf/agent")
require.Contains(t, stdOut, "gitea/gitea")
require.Contains(t, stdOut, "library/registry")

Expand Down
2 changes: 1 addition & 1 deletion src/test/packages/00-remote-pull-fail/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ components:
- name: doesnotexist-docker
required: true
images:
- ghcr.io/defenseunicorns/doesnotexist:1.3.3.7
- ghcr.io/zarf-dev/doesnotexist:1.3.3.7
2 changes: 1 addition & 1 deletion src/test/packages/08-differential-package/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ components:
required: true
images:
- ghcr.io/stefanprodan/podinfo:6.0.0
- ghcr.io/defenseunicorns/zarf/agent:###ZARF_PKG_TMPL_PACKAGE_VERSION###
- ghcr.io/zarf-dev/zarf/agent:###ZARF_PKG_TMPL_PACKAGE_VERSION###
repos:
- https://github.com/defenseunicorns/zarf.git@c74e2e9626da0400e0a41e78319b3054c53a5d4e
- https://github.com/defenseunicorns/zarf.git@refs/tags/###ZARF_PKG_TMPL_PACKAGE_VERSION###
Expand Down
2 changes: 1 addition & 1 deletion src/test/packages/14-index-sha/image-index/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ components:
- name: baseline
required: true
images:
- ghcr.io/defenseunicorns/zarf/agent:v0.32.6@sha256:05a82656df5466ce17c3e364c16792ae21ce68438bfe06eeab309d0520c16b48
- ghcr.io/zarf-dev/zarf/agent:v0.32.6@sha256:05a82656df5466ce17c3e364c16792ae21ce68438bfe06eeab309d0520c16b48

0 comments on commit b9133f5

Please sign in to comment.