Fix SO CEL expression and migrate index Dockerfile

Signed-off-by: Pierangelo Di Pilato <[email protected]>

config/serverless-operator.yaml

@@ -326,7 +326,7 @@ repositories:
     - serving/metadata-webhook/.*
     - serving/ingress/.*
     - olm-catalog/serverless-operator/Dockerfile
-    - olm-catalog/serverless-operator/index/Dockerfile
+    - olm-catalog/serverless-operator-index/Dockerfile
   e2e:
   - match: ^operator-e2e$
   - match: ^test-upgrade$

pkg/prowgen/prowgen_konflux.go

@@ -275,20 +275,18 @@ func GenerateKonfluxServerlessOperator(ctx context.Context, openshiftRelease Rep
 			},
 			AdditionalTektonCELExpressionFunc: func(cfg cioperatorapi.ReleaseBuildConfiguration, ib cioperatorapi.ProjectDirectoryImageBuildStepConfiguration) string {
 				if string(ib.To) == "serverless-index" {
-					return "&& ( " +
-						"files.all.exists(x, x.matches('^olm-catalog/serverless-operator/index/') ||" +
-						"files.all.exists(x, x.matches('^.tekton/.*serverless-index.*') " +
-						")"
+					return " && (" +
+						" files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/')) ||" +
+						" files.all.exists(x, x.matches('^.tekton/'))" +
+						" )"
 				}
 				if string(ib.To) == "serverless-bundle" {
-					return "&& ( " +
-						"files.all.exists(x, x.matches('^olm-catalog/serverless-operator/manifests/')) || " +
-						"files.all.exists(x, x.matches('^olm-catalog/serverless-operator/metadata/')) || " +
-						"files.all.exists(x, x.matches('^olm-catalog/serverless-operator/Dockerfile')) ||" +
-						"files.all.exists(x, x.matches('^.tekton/.*serverless-bundle.*') " +
-						")"
+					return " && (" +
+						" files.all.exists(x, x.matches('^olm-catalog/serverless-operator/')) ||" +
+						" files.all.exists(x, x.matches('^.tekton/'))" +
+						" )"
 				}
-				nonCatalog := "&& files.all.exists(x, !x.matches('^olm-catalog/'))"
+				nonCatalog := " && files.all.exists(x, !x.matches('^olm-catalog/'))"
 				return nonCatalog
 			},
 			Includes: []string{