Merge pull request #332 from vmware-tanzu/stop-using-ttl.sh

Stop using ttl.sh as the registry for windows
carvel-dev · Feb 14, 2022 · 92ec90d · 92ec90d
2 parents 490fd5b + 7396fe2
commit 92ec90d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/gh-test.yml b/.github/workflows/gh-test.yml
@@ -51,13 +51,15 @@ jobs:
         export PATH="$GOPATH/bin:$PATH"
         cd src/github.com/${{ github.repository }}
 
-        export IMGPKG_E2E_IMAGE="ttl.sh/github-action-test-relocation-$GITHUB_RUN_ID"
-        export IMGPKG_E2E_RELOCATION_REPO="ttl.sh/github-action-imgpkg-test-$GITHUB_RUN_ID"
+        export IMGPKG_E2E_IMAGE="localhost:5000/github-action-test-relocation-$GITHUB_RUN_ID"
+        export IMGPKG_E2E_RELOCATION_REPO="localhost:5000/github-action-imgpkg-test-$GITHUB_RUN_ID"
 
         go install github.com/sigstore/cosign/cmd/cosign@v0.5.0
 
         alias cosign=cosign.exe
 
+        docker run -d -p 5000:5000 --restart=always --name registry ghcr.io/vmware-tanzu/carvel-imgpkg/registry-windows:2.8.0-2022
+
         export IMGPKG_BINARY_EXT=".exe"
         ./hack/test-all.sh
-        '
+        '
diff --git a/test/e2e/copy_from_image_test.go b/test/e2e/copy_from_image_test.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -210,8 +211,8 @@ func TestCopyRepoToTarAndThenCopyFromTarToRepo(t *testing.T) {
 				t.Skip("Skipping this test due index.docker.io limitation. See https://github.com/docker/hub-feedback/issues/2132")
 			}
 
-			if mediaType == types.DockerForeignLayer && strings.HasPrefix(env.RelocationRepo, "ttl.sh") {
-				t.Skip("Skipping this test due ttl.sh limitation.")
+			if mediaType == types.DockerForeignLayer && (strings.HasPrefix(env.RelocationRepo, "ttl.sh") || runtime.GOOS == "windows") {
+				t.Skip("Skipping this test due ttl.sh/windows limitation.")
 			}
 
 			if mediaType == types.OCIUncompressedRestrictedLayer && strings.HasPrefix(env.RelocationRepo, "gcr.io") {