Skip to content

Commit

Permalink
Remove repo1 CICD dependency due to unreliable uptime (#817)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff-mccoy authored Sep 30, 2022
1 parent b28c152 commit e3c20a0
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ test-cves: ensure-ui-build-dir
cve-report: ensure-ui-build-dir
go run main.go tools sbom packages . -o json | grype -o template -t .hooks/grype.tmpl > build/zarf-known-cves.csv

test-cves:
go run main.go tools sbom packages . -o json | grype --fail-on low

cve-report:
go run main.go tools sbom packages . -o json | grype -o template -t .hooks/grype.tmpl > build/zarf-known-cves.csv

# Inject and deploy a new dev version of zarf agent for testing (should have an existing zarf agent deployemt)
# @todo: find a clean way to dynamically support Kind or k3d:
# when using kind: kind load docker-image $(tag)
Expand Down
2 changes: 0 additions & 2 deletions examples/git-data/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ components:
- https://github.com/defenseunicorns/[email protected]
# Do a commit hash Git Repo mirror
- https://github.com/defenseunicorns/zarf.git@c74e2e9626da0400e0a41e78319b3054c53a5d4e
# Do a tag-provided Git Repo mirror with the default branch of main
- https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/[email protected]
# Do a full Git Repo Mirror
- https://github.com/stefanprodan/podinfo.git
# Clone an azure repo that breaks in go-git and has to fall back to the host git
Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/22_git_and_flux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func testGitServerReadOnly(t *testing.T, gitURL string) {
config.InitState(state)

// Get the repo as the readonly user
repoName := "twistlock-327c7a99d77a530fe94872911f0dabef839441bf"
repoName := "zarf-bf89aea1b43dd0ea83360d4a219643a4bc8424c6"
getRepoRequest, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/repos/%s/%s", gitURL, config.GetGitServerInfo().PushUsername, repoName), nil)
getRepoResponseBody, err := git.DoHttpThings(getRepoRequest, config.ZarfGitReadUser, config.GetGitServerInfo().PullPassword)
assert.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion src/test/external-test/external_init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestExternalDeploy(t *testing.T) {
require.NoError(t, err, "unable to initialize the k8s server with zarf")

// Deploy the flux example package
deployArgs := []string{"package", "deploy", "../../../build/zarf-package-flux-test-amd64.tar.zst", "--confirm", "-l=trace"}
deployArgs := []string{"package", "deploy", "../../../build/zarf-package-flux-test-amd64.tar.zst", "--confirm"}
_, _, err = utils.ExecCommandWithContext(context.TODO(), true, zarfBinPath, deployArgs...)
require.NoError(t, err, "unable to deploy flux example package")

Expand Down

0 comments on commit e3c20a0

Please sign in to comment.