Merge pull request #14758 from bparees/newapp_retry

Merged by openshift-bot

pkg/generate/app/cmd/newapp.go

@@ -10,8 +10,10 @@ import (
 	"strings"
 	"time"
 
+	dockerfileparser "github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/fsouza/go-dockerclient"
 	"github.com/golang/glog"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,7 +24,6 @@ import (
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 
-	dockerfileparser "github.com/docker/docker/builder/dockerfile/parser"
 	ometa "github.com/openshift/origin/pkg/api/meta"
 	authapi "github.com/openshift/origin/pkg/authorization/api"
 	buildapi "github.com/openshift/origin/pkg/build/api"

pkg/generate/app/sourcelookup.go

@@ -79,7 +79,15 @@ func IsRemoteRepository(s string) (bool, error) {
 	}
 	url.Fragment = ""
 	gitRepo := git.NewRepository()
-	if _, _, err := gitRepo.ListRemote(url.String()); err != nil {
+
+	// try up to 3 times to reach the remote git repo
+	for i := 0; i < 3; i++ {
+		_, _, err = gitRepo.ListRemote(url.String())
+		if err == nil {
+			break
+		}
+	}
+	if err != nil {
 		glog.V(5).Infof("could not list git remotes for %s: %v", s, err)
 		return false, err
 	}