[bot] Update main from tektoncd/pipeline to 0f2d9f1

    $ git diff --stat 0f2d9f1..cfc5c7b
     pkg/remoteresolution/resolver/git/resolver_test.go | 6 +++---
     pkg/resolution/resolver/git/resolver.go            | 6 ++++++
     pkg/resolution/resolver/git/resolver_test.go       | 6 +++---
     3 files changed, 12 insertions(+), 6 deletions(-)

https://github.com/tektoncd/pipeline/compare/0f2d9f1f0fbc0f0865dc360ae7b971c8ec24aff5..cfc5c7b82ecdebf5db9dbde9f85662f710c00233

head

@@ -1 +1 @@
-cfc5c7b82ecdebf5db9dbde9f85662f710c00233
+0f2d9f1f0fbc0f0865dc360ae7b971c8ec24aff5

upstream/pkg/remoteresolution/resolver/git/resolver_test.go

@@ -645,9 +645,9 @@ func TestResolve(t *testing.T) {
 			gitresolution.APISecretKeyKey:       "token",
 			gitresolution.APISecretNamespaceKey: system.Namespace(),
 		},
-		apiToken:       "some-token",
-		expectedStatus: resolution.CreateResolutionRequestFailureStatus(),
-		expectedErr:    createError("missing or empty scm-type value in configmap"),
+		apiToken:          "some-token",
+		expectedCommitSHA: commitSHAsInSCMRepo[0],
+		expectedStatus:    resolution.CreateResolutionRequestStatusWithData(mainPipelineYAML),
 	}}
 
 	for _, tc := range testCases {

upstream/pkg/resolution/resolver/git/resolver.go

@@ -530,18 +530,12 @@ func getSCMTypeAndServerURL(ctx context.Context, params map[string]string) (stri
 	}
 	if scmType == "" {
 		scmType = conf.SCMType
-		if scmType == "" {
-			return "", "", fmt.Errorf("missing or empty %s value in configmap", SCMTypeKey)
-		}
 	}
 	if key, ok := params[ServerURLParam]; ok {
 		serverURL = key
 	}
 	if serverURL == "" {
 		serverURL = conf.ServerURL
-		if serverURL == "" {
-			return "", "", fmt.Errorf("missing or empty %s value in configmap", ServerURLKey)
-		}
 	}
 	return scmType, serverURL, nil
 }

upstream/pkg/resolution/resolver/git/resolver_test.go

@@ -642,9 +642,9 @@ func TestResolve(t *testing.T) {
 			APISecretKeyKey:       "token",
 			APISecretNamespaceKey: system.Namespace(),
 		},
-		apiToken:       "some-token",
-		expectedStatus: resolution.CreateResolutionRequestFailureStatus(),
-		expectedErr:    createError("missing or empty scm-type value in configmap"),
+		apiToken:          "some-token",
+		expectedCommitSHA: commitSHAsInSCMRepo[0],
+		expectedStatus:    resolution.CreateResolutionRequestStatusWithData(mainPipelineYAML),
 	}}
 
 	for _, tc := range testCases {