Merge pull request #1245 from pivotal/fix-e2e

Fix e2e

.github/workflows/ci.yaml

@@ -366,7 +366,7 @@ jobs:
         export IMAGE_REGISTRY_USERNAME=${{ env.REGISTRY_USER }}
         export IMAGE_REGISTRY_PASSWORD=${{ env.REGISTRY_PASS }}
 
-        export GIT_PRIVATE_REPO=${{ env.E2E_PRIVATE_REPO }}
+        export GIT_PRIVATE_REPO=${{ vars.E2E_PRIVATE_REPO }}
         export GIT_BASIC_USERNAME="${{ secrets.E2E_PRIVATE_REPO_USERNAME }}"
         export GIT_BASIC_PASSWORD="${{ secrets.E2E_PRIVATE_REPO_PASSWORD }}"
         export GIT_SSH_PRIVATE_KEY="${{ secrets.E2E_PRIVATE_REPO_PRIVATE_KEY }}"
@@ -407,6 +407,11 @@ jobs:
         export IMAGE_REGISTRY_PASSWORD=${{ env.REGISTRY_PASS }}
         export KPACK_TEST_NAMESPACE_LABELS="istio-injection=enabled"
 
+        export GIT_PRIVATE_REPO=${{ vars.E2E_PRIVATE_REPO }}
+        export GIT_BASIC_USERNAME="${{ secrets.E2E_PRIVATE_REPO_USERNAME }}"
+        export GIT_BASIC_PASSWORD="${{ secrets.E2E_PRIVATE_REPO_PASSWORD }}"
+        export GIT_SSH_PRIVATE_KEY="${{ secrets.E2E_PRIVATE_REPO_PRIVATE_KEY }}"
+
         make e2e
 
   release:

test/config.go

@@ -114,14 +114,15 @@ func (c *config) makeGitBasicAuthSecret(secretName, namespace string) (*corev1.S
 	}
 
 	// convert `github.com/org/repo` -> `https://github.com/org/repo.git`
-	repo := fmt.Sprintf("https://%v.git", c.gitSourcePrivateRepo)
+	repo := fmt.Sprintf("https://%v", c.gitSourcePrivateRepo)
+	host := strings.Split(c.gitSourcePrivateRepo, "/")[0]
 
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      secretName,
 			Namespace: namespace,
 			Annotations: map[string]string{
-				v1alpha2.GITSecretAnnotationPrefix: "https://github.com",
+				v1alpha2.GITSecretAnnotationPrefix: fmt.Sprintf("https://%v", host),
 			},
 		},
 		Data: map[string][]byte{
@@ -138,15 +139,16 @@ func (c *config) makeGitSSHAuthSecret(secretName, namespace string) (*corev1.Sec
 	}
 
 	// convert `github.com/org/repo` -> `[email protected]:org/repo.git`
-	repo := fmt.Sprintf("git@%v.git", c.gitSourcePrivateRepo)
+	repo := fmt.Sprintf("git@%v", c.gitSourcePrivateRepo)
 	repo = strings.Replace(repo, "/", ":", 1)
+	host := strings.Split(c.gitSourcePrivateRepo, "/")[0]
 
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      secretName,
 			Namespace: namespace,
 			Annotations: map[string]string{
-				v1alpha2.GITSecretAnnotationPrefix: "git@github.com",
+				v1alpha2.GITSecretAnnotationPrefix: fmt.Sprintf("git@%v", host),
 			},
 		},
 		Data: map[string][]byte{

test/execute_build_test.go

@@ -123,6 +123,13 @@ func testCreateImage(t *testing.T, when spec.G, it spec.S) {
 	}
 
 	it.Before(func() {
+		// register a cleanup function that dumps crds only if the test fails
+		t.Cleanup(func() {
+			if t.Failed() {
+				dumpK8s(t, ctx, clients, testNamespace)
+			}
+		})
+
 		cfg = loadConfig(t)
 		builtImages = map[string]struct{}{}
 
@@ -638,7 +645,6 @@ func waitUntilReady(t *testing.T, ctx context.Context, clients *clients, objects
 		gvr, _ := meta.UnsafeGuessKindToResource(ob.GetGroupVersionKind())
 
 		eventually(t, func() bool {
-
 			unstructured, err := clients.dynamicClient.Resource(gvr).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
 			require.NoError(t, err)
 

test/testhelpers.go

@@ -1,8 +1,15 @@
 package test
 
 import (
+	"context"
+	"os"
 	"testing"
 	"time"
+
+	"github.com/ghodss/yaml"
+	"github.com/pivotal/kpack/pkg/logs"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func eventually(t *testing.T, fun func() bool, interval time.Duration, duration time.Duration) {
@@ -19,3 +26,55 @@ func eventually(t *testing.T, fun func() bool, interval time.Duration, duration
 		}
 	}
 }
+
+func printObject(t *testing.T, obj interface{}) {
+	data, err := yaml.Marshal(obj)
+	require.NoError(t, err)
+
+	t.Log(string(data))
+}
+
+func dumpK8s(t *testing.T, ctx context.Context, clients *clients, namespace string) {
+	const header = "=================%v=================\n"
+
+	t.Logf(header, "ClusterBuilders")
+	clusterBuilders, err := clients.client.KpackV1alpha2().ClusterBuilders().List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	for _, cb := range clusterBuilders.Items {
+		printObject(t, cb)
+	}
+
+	t.Logf(header, "Builders")
+	builders, err := clients.client.KpackV1alpha2().Builders(namespace).List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	for _, b := range builders.Items {
+		printObject(t, b)
+	}
+
+	t.Logf(header, "Images")
+	images, err := clients.client.KpackV1alpha2().Images(namespace).List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	for _, i := range images.Items {
+		printObject(t, i)
+	}
+
+	t.Logf(header, "SourceResolvers")
+	sourceResolvers, err := clients.client.KpackV1alpha2().SourceResolvers(namespace).List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	for _, sr := range sourceResolvers.Items {
+		printObject(t, sr)
+	}
+
+	t.Logf(header, "Pods")
+	pods, err := clients.k8sClient.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	for _, p := range pods.Items {
+		printObject(t, p)
+	}
+
+	t.Logf(header, "Image logs")
+	for _, i := range images.Items {
+		err = logs.NewBuildLogsClient(clients.k8sClient).GetImageLogs(ctx, os.Stdout, i.Name, i.Namespace)
+		require.NoError(t, err)
+	}
+}