Skip hermetic Dockerfiles in prowgen image discovery (#306)

Signed-off-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · Oct 1, 2024 · d744cbc · d744cbc
1 parent 141a787
commit d744cbc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml
@@ -1,6 +1,8 @@
 config:
   branches:
     release-next:
+      skipDockerFilesMatches:
+      - .*hermetic.*
       konflux:
         javaImages:
         - .*eventing-kafka-broker-receiver
@@ -35,6 +37,8 @@ config:
       - onDemand: true
         version: "4.13"
     release-v1.15:
+      skipDockerFilesMatches:
+      - .*hermetic.*
       konflux:
         enabled: true
       openShiftVersions:

diff --git a/pkg/prowgen/prowgen_images_discovery.go b/pkg/prowgen/prowgen_images_discovery.go
@@ -107,6 +107,11 @@ func discoverDockerfiles(r Repository, skipDockerFiles []string) ([]string, erro
 	if len(r.Dockerfiles.Matches) != 0 {
 		dockerFilesToInclude = r.Dockerfiles.Matches
 	}
+	skips := make([]*regexp.Regexp, 0, len(skipDockerFiles))
+	for _, dockerfile := range skipDockerFiles {
+		skips = append(skips, regexp.MustCompile(dockerfile))
+	}
+
 	filteredDockerFiles := slices.Filter(nil, dockerFilesToInclude, func(s string) bool {
 		return !slices.Contains(skipDockerFiles, s)
 	})
@@ -132,6 +137,11 @@ func discoverDockerfiles(r Repository, skipDockerFiles []string) ([]string, erro
 		if !include {
 			return nil
 		}
+		for _, s := range skips {
+			if s.MatchString(path) {
+				return nil
+			}
+		}
 		dockerfiles.Insert(filepath.Join(rootDir, path))
 		return nil
 	})