Skip to content

Commit a550ac1

Browse files
chore: move public test repo (#2739)
Signed-off-by: Austin Abro <[email protected]>
1 parent 0372e4c commit a550ac1

File tree

11 files changed

+36
-25
lines changed

11 files changed

+36
-25
lines changed

.github/workflows/build-rust-injector.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Zarf Injector Rust Binaries
22

33
permissions:
44
contents: read
5+
id-token: write
56

67
on:
78
workflow_dispatch:

.github/workflows/dummy-dco.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: DCO
2+
on:
3+
merge_group:
4+
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
DCO:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue"

examples/git-data/zarf.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ components:
88
- name: full-repo
99
repos:
1010
# The following performs a full Git Repo Mirror with `go-git` (internal to Zarf)
11-
- https://github.com/defenseunicorns/zarf-public-test.git
11+
- https://github.com/zarf-dev/zarf-public-test.git
1212
# The following performs a full Git Repo Mirror forcing a fallback to host `git`
1313
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test
1414

1515
- name: specific-tag
1616
repos:
1717
# The following performs a tag Git Repo Mirror with `go-git` (internal to Zarf)
18-
- https://github.com/defenseunicorns/[email protected]
18+
- https://github.com/zarf-dev/[email protected]
1919
# The following performs a refspec tag Git Repo Mirror with `go-git`
20-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/tags/v0.0.1
20+
- https://github.com/zarf-dev/zarf-public-test.git@refs/tags/v0.0.1
2121
# The following performs a tag Git Repo Mirror forcing a fallback to host `git`
2222
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/[email protected]
2323

2424
- name: specific-branch
2525
repos:
2626
# The following performs a branch Git Repo Mirror with `go-git` (internal to Zarf)
27-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
27+
- https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
2828
# The following performs a branch Git Repo Mirror forcing a fallback to host `git`
2929
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@refs/heads/dragons
3030

3131
- name: specific-hash
3232
repos:
3333
# The following performs a SHA Git Repo Mirror with `go-git` (internal to Zarf)
34-
- https://github.com/defenseunicorns/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
34+
- https://github.com/zarf-dev/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
3535
# The following performs a SHA Git Repo Mirror forcing a fallback to host `git`
3636
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@01a23218923f24194133b5eb11268cf8d73ff1bb
3737

src/pkg/packager/lint/lint_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func TestValidateComponent(t *testing.T) {
196196

197197
t.Run("Unpinnned repo warning", func(t *testing.T) {
198198
t.Parallel()
199-
unpinnedRepo := "https://github.com/defenseunicorns/zarf-public-test.git"
199+
unpinnedRepo := "https://github.com/zarf-dev/zarf-public-test.git"
200200
component := types.ZarfComponent{Repos: []string{
201201
unpinnedRepo,
202202
"https://dev.azure.com/defenseunicorns/zarf-public-test/_git/[email protected]",

src/test/e2e/07_create_git_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestCreateGit(t *testing.T) {
2626
defer e2e.CleanFiles(extractDir)
2727

2828
// Verify the full-repo component
29-
gitDir := fmt.Sprintf("%s/components/full-repo/repos/zarf-public-test-1143224168/.git", extractDir)
29+
gitDir := fmt.Sprintf("%s/components/full-repo/repos/zarf-public-test-2395699829/.git", extractDir)
3030
verifyGitRepo(t, gitDir,
3131
"0a6b587", "(HEAD -> main, online-upstream/main)", "Adjust dragon spacing",
3232
"v0.0.1\n", " dragons\n* main\n")
@@ -38,13 +38,13 @@ func TestCreateGit(t *testing.T) {
3838
"v0.0.1\n", " dragons\n* main\n")
3939

4040
// Verify specific tag component shorthand tag
41-
gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-443792367/.git", extractDir)
41+
gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-470731282/.git", extractDir)
4242
verifyGitRepo(t, gitDir,
4343
"5249809", "(HEAD -> zarf-ref-v0.0.1, tag: v0.0.1)", "Added README.md",
4444
"v0.0.1\n", "* zarf-ref-v0.0.1\n")
4545

4646
// Verify specific tag component refspec tag
47-
gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-1981411475/.git", extractDir)
47+
gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-482869567/.git", extractDir)
4848
verifyGitRepo(t, gitDir,
4949
"5249809", "(HEAD -> zarf-ref-v0.0.1, tag: v0.0.1)", "Added README.md",
5050
"v0.0.1\n", "* zarf-ref-v0.0.1\n")
@@ -56,7 +56,7 @@ func TestCreateGit(t *testing.T) {
5656
"v0.0.1\n", "* zarf-ref-v0.0.1\n")
5757

5858
// Verify specific branch component
59-
gitDir = fmt.Sprintf("%s/components/specific-branch/repos/zarf-public-test-1670574289/.git", extractDir)
59+
gitDir = fmt.Sprintf("%s/components/specific-branch/repos/zarf-public-test-2265377406/.git", extractDir)
6060
verifyGitRepo(t, gitDir,
6161
"01a2321", "(HEAD -> dragons, online-upstream/dragons)", "Explain what this repo does",
6262
"", "* dragons\n")
@@ -68,7 +68,7 @@ func TestCreateGit(t *testing.T) {
6868
"", "* dragons\n")
6969

7070
// Verify specific hash component
71-
gitDir = fmt.Sprintf("%s/components/specific-hash/repos/zarf-public-test-2357350897/.git", extractDir)
71+
gitDir = fmt.Sprintf("%s/components/specific-hash/repos/zarf-public-test-3231174532/.git", extractDir)
7272
verifyGitRepo(t, gitDir,
7373
"01a2321", "(HEAD -> zarf-ref-01a23218923f24194133b5eb11268cf8d73ff1bb, online-upstream/dragons)", "Explain what this repo does",
7474
"v0.0.1\n", " main\n* zarf-ref-01a23218923f24194133b5eb11268cf8d73ff1bb\n")

src/test/e2e/09_component_compose_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ func (suite *CompositionSuite) Test_1_FullComposability() {
139139
- ghcr.io/stefanprodan/podinfo:6.4.0
140140
- ghcr.io/stefanprodan/podinfo:6.4.1
141141
repos:
142-
- https://github.com/defenseunicorns/zarf-public-test.git
143-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
142+
- https://github.com/zarf-dev/zarf-public-test.git
143+
- https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
144144
`)
145145

146146
// Check dataInjections

src/test/e2e/22_git_and_gitops_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func testGitServerReadOnly(ctx context.Context, t *testing.T, gitURL string) {
7777
gitCfg := git.New(zarfState.GitServer)
7878

7979
// Get the repo as the readonly user
80-
repoName := "zarf-public-test-2469062884"
80+
repoName := "zarf-public-test-2363058019"
8181
getRepoRequest, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/repos/%s/%s", gitURL, zarfState.GitServer.PushUsername, repoName), nil)
8282
getRepoResponseBody, _, err := gitCfg.DoHTTPThings(getRepoRequest, types.ZarfGitReadUser, zarfState.GitServer.PullPassword)
8383
require.NoError(t, err)
@@ -101,7 +101,7 @@ func testGitServerTagAndHash(ctx context.Context, t *testing.T, gitURL string) {
101101
// Init the state variable
102102
zarfState, err := c.LoadZarfState(ctx)
103103
require.NoError(t, err, "Failed to load Zarf state")
104-
repoName := "zarf-public-test-2469062884"
104+
repoName := "zarf-public-test-2363058019"
105105

106106
gitCfg := git.New(zarfState.GitServer)
107107

src/test/packages/09-composable-packages/sub-package/zarf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ components:
2626
images:
2727
- ghcr.io/stefanprodan/podinfo:6.4.0
2828
repos:
29-
- https://github.com/defenseunicorns/zarf-public-test.git
29+
- https://github.com/zarf-dev/zarf-public-test.git
3030
files:
3131
- source: ../files/coffee-ipsum.txt
3232
target: coffee-ipsum.txt

src/test/packages/09-composable-packages/zarf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ components:
4040
images:
4141
- ghcr.io/stefanprodan/podinfo:6.4.1
4242
repos:
43-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
43+
- https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
4444
files:
4545
- source: files/coffee-ipsum.txt
4646
target: coffee-ipsum.txt

src/test/packages/12-lint/zarf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ components:
1414

1515
- name: full-repo
1616
repos:
17-
- https://github.com/defenseunicorns/zarf-public-test.git
17+
- https://github.com/zarf-dev/zarf-public-test.git
1818
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/[email protected]
1919
- https://gitlab.com/gitlab-org/build/omnibus-mirror/pcre2/-/tree/vreverse?ref_type=heads
2020
images:

src/test/packages/22-git-data/zarf.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ components:
99
required: true
1010
repos:
1111
# Do a full Git Repo Mirror
12-
- https://github.com/defenseunicorns/zarf-public-test.git
12+
- https://github.com/zarf-dev/zarf-public-test.git
1313
# The following performs a full Git Repo Mirror forcing a fallback to host `git`
1414
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test
15-
# Perform a full repo mirror of a simple repository with a single branch - (this causes an "already up to date" error in go-git)
16-
- https://github.com/defenseunicorns/golang-tekton-hello-world.git
1715

1816
- name: specific-tag
1917
required: true
2018
repos:
2119
# The following performs a tag Git Repo Mirror with `go-git` (internal to Zarf)
22-
- https://github.com/defenseunicorns/[email protected]
20+
- https://github.com/zarf-dev/[email protected]
2321
# The following performs a refspec tag Git Repo Mirror with `go-git`
24-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/tags/v0.0.1
22+
- https://github.com/zarf-dev/zarf-public-test.git@refs/tags/v0.0.1
2523
# The following performs a tag Git Repo Mirror forcing a fallback to host `git`
2624
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/[email protected]
2725
actions:
@@ -36,7 +34,7 @@ components:
3634
required: true
3735
repos:
3836
# The following performs a branch Git Repo Mirror with `go-git` (internal to Zarf)
39-
- https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
37+
- https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
4038
# The following performs a branch Git Repo Mirror forcing a fallback to host `git`
4139
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@refs/heads/dragons
4240
actions:
@@ -51,7 +49,7 @@ components:
5149
required: true
5250
repos:
5351
# The following performs a SHA Git Repo Mirror with `go-git` (internal to Zarf)
54-
- https://github.com/defenseunicorns/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
52+
- https://github.com/zarf-dev/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
5553
# The following performs a SHA Git Repo Mirror forcing a fallback to host `git`
5654
- https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@01a23218923f24194133b5eb11268cf8d73ff1bb
5755
actions:

0 commit comments

Comments
 (0)