diff --git a/.github/workflows/test-kctrl-gh.yml b/.github/workflows/test-kctrl-gh.yml index e2be03c79..a22734e49 100644 --- a/.github/workflows/test-kctrl-gh.yml +++ b/.github/workflows/test-kctrl-gh.yml @@ -34,6 +34,12 @@ jobs: with: only: ytt, kbld, imgpkg, vendir, kapp token: ${{ secrets.GITHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | set -e -x diff --git a/cli/test/e2e/package_repository_test.go b/cli/test/e2e/package_repository_test.go index 3cd5dc377..504513502 100644 --- a/cli/test/e2e/package_repository_test.go +++ b/cli/test/e2e/package_repository_test.go @@ -4,11 +4,8 @@ package e2e import ( - "fmt" "testing" - "time" - uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" ) @@ -210,30 +207,33 @@ func TestPackageRepositoryTagSemver(t *testing.T) { } cleanUp() - defer cleanUp() + //defer cleanUp() logger.Section("adding a repository", func() { kappCtrl.Run([]string{"package", "repository", "add", "-r", pkgrName, "--url", pkgrURL + ":v1.0.0"}) - kubectl.Run([]string{"get", kind, pkgrName}) + out := kubectl.Run([]string{"get", kind, pkgrName, "-oyaml"}) + require.Contains(t, out, "tag: v1.0.0") kubectl.Run([]string{"get", "pkgm/pkg.test.carvel.dev"}) kubectl.Run([]string{"get", "pkg/pkg.test.carvel.dev.1.0.0"}) kubectl.Run([]string{"get", "pkg/pkg.test.carvel.dev.2.0.0"}) }) - logger.Section("adding a repository", func() { + logger.Section("deleting a repository", func() { kappCtrl.Run([]string{"package", "repository", "delete", "-r", pkgrName}) }) logger.Section("adding a repository", func() { - out := kappCtrl.Run([]string{"package", "repository", "add", "-r", pkgrName, "--url", pkgrURL + ":v2.0.0", "--semver-tag-constraints", "1.0.0"}) - t.Logf(out) + kappCtrl.Run([]string{"package", "repository", "add", "-r", pkgrName, "--url", pkgrURL + ":v2.0.0", "--semver-tag-constraints", "1.0.0"}) + out := kubectl.Run([]string{"get", kind, pkgrName, "-oyaml"}) + require.Contains(t, out, "tag: v2.0.0") }) - logger.Section("adding a repository", func() { - kappCtrl.Run([]string{"package", "repository", "add", "-r", pkgrName, "--url", pkgrURL, "--semver-tag-constraints", ">1.0.0"}) + logger.Section("updating a repository", func() { + kappCtrl.Run([]string{"package", "repository", "update", "-r", pkgrName, "--url", pkgrURL, "--semver-tag-constraints", ">1.0.0"}) - kubectl.Run([]string{"get", kind, pkgrName}) + out := kubectl.Run([]string{"get", kind, pkgrName, "-oyaml"}) + require.Contains(t, out, "tag: v3.0.0") kubectl.Run([]string{"get", "pkgm/pkg.test.carvel.dev"}) kubectl.Run([]string{"get", "pkg/pkg.test.carvel.dev.1.0.0"}) kubectl.Run([]string{"get", "pkg/pkg.test.carvel.dev.2.0.0"})