fix(BuildPipeline): filter pipeine run based on sender annotation

openshift · Jun 10, 2024 · ee781ec · ee781ec
1 parent 731eb36
commit ee781ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/src/hooks/usePACState.ts b/src/hooks/usePACState.ts
@@ -49,20 +49,12 @@ const usePACState = (component: ComponentKind) => {
           },
           matchExpressions: [
             { key: PipelineRunLabel.PULL_REQUEST_NUMBER_LABEL, operator: 'DoesNotExist' },
-            {
-              key: PipelineRunLabel.COMMIT_USER_LABEL,
-              values: [prBotName],
-              operator: 'NotEquals',
-            },
-            {
-              key: PipelineRunLabel.COMMIT_USER_LABEL,
-              operator: 'Exists',
-            },
           ],
         },
-        limit: 1,
+        // this limit is based on the assumption that user merges the PR after the component is created
+        limit: 10,
       }),
-      [component.metadata.name, component.spec.application, prBotName],
+      [component.metadata.name, component.spec.application],
     ),
   );
 
@@ -77,6 +69,10 @@ const usePACState = (component: ComponentKind) => {
     [configurationTime, pipelineBuildRuns],
   );
 
+  const prMerged = runsForComponent.find(
+    (r) => !r.metadata?.annotations?.[PipelineRunLabel.COMMIT_USER_LABEL]?.includes(prBotName),
+  );
+
   return isSample
     ? PACState.sample
     : isConfigureRequested
@@ -86,7 +82,7 @@ const usePACState = (component: ComponentKind) => {
     : pacProvision === ComponentBuildState.enabled
     ? !pipelineBuildRunsLoaded
       ? PACState.loading
-      : runsForComponent?.length > 0
+      : prMerged
       ? PACState.ready
       : PACState.pending
     : !pacProvision || pacProvision === ComponentBuildState.disabled

diff --git a/src/hooks/usePACStatesForComponents.ts b/src/hooks/usePACStatesForComponents.ts
@@ -89,19 +89,10 @@ const usePACStatesForComponents = (components: ComponentKind[]): PacStatesForCom
               values: neededNames,
             },
             { key: PipelineRunLabel.PULL_REQUEST_NUMBER_LABEL, operator: 'DoesNotExist' },
-            {
-              key: PipelineRunLabel.COMMIT_USER_LABEL,
-              values: [prBotName],
-              operator: 'NotEquals',
-            },
-            {
-              key: PipelineRunLabel.COMMIT_USER_LABEL,
-              operator: 'Exists',
-            },
           ],
         },
       }),
-      [application, neededNames, prBotName],
+      [application, neededNames],
     ),
   );
 
@@ -117,15 +108,18 @@ const usePACStatesForComponents = (components: ComponentKind[]): PacStatesForCom
         );
         const configurationTime = buildStatus?.pac?.['configuration-time'];
 
-        const runForComponent = pipelineBuildRuns?.find(
+        const runsForComponent = pipelineBuildRuns?.filter(
           (p) =>
             p.metadata.labels?.[PipelineRunLabel.COMPONENT] === componentName &&
             (configurationTime
               ? new Date(p.metadata.creationTimestamp) > new Date(configurationTime)
               : true),
         );
-
-        if (runForComponent) {
+        const prMerged = runsForComponent.find(
+          (r) =>
+            !r.metadata?.annotations?.[PipelineRunLabel.COMMIT_USER_LABEL]?.includes(prBotName),
+        );
+        if (prMerged) {
           updates[componentName] = PACState.ready;
           update = true;
         } else if (!getNextPage) {
@@ -144,7 +138,7 @@ const usePACStatesForComponents = (components: ComponentKind[]): PacStatesForCom
         getNextPage();
       }
     }
-  }, [components, getNextPage, neededNames, pipelineBuildRuns, pipelineBuildRunsLoaded]);
+  }, [components, getNextPage, neededNames, pipelineBuildRuns, pipelineBuildRunsLoaded, prBotName]);
 
   return componentPacStates;
 };