Skip to content

Commit

Permalink
Issue #615 - review comment fixes
Browse files Browse the repository at this point in the history
- Edit operation now includes ReadinessGates and Conditions passed
  in as part of the edit request
  - adding them to existing ones from the Kptfile in the
    PackageRevision being edited
- Init, Edit, and Clone operations now merge their lists of
  Conditions/ReadinessGates (any passed in in the API request
  are added to the defaults/existing ones)
  - instead of using slices.Concat which allowed duplicates
    (with same Condition.Type) to stay
  - Conditions/ReadinessGates passed in in the API request
    will OVERRIDE default/existing ones

nephio-project/nephio#615
  • Loading branch information
JamesMcDermott committed Feb 27, 2025
1 parent 489ef74 commit cdf244c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3081,7 +3081,7 @@ func (t *PorchSuite) TestPackageVariantReadinessGate(ctx context.Context) {
downstreamPr, _ = t.WaitUntilPackageRevisionFulfillingConditionExists(ctx, 20*time.Second, func(pr porchapi.PackageRevision) bool {
return slices.Contains(pr.Status.Conditions, packagevariant.ConditionPipelinePVRevisionReady)
})
require.NotNil(t, downstreamPr, "no PackageRevision found with Condition of Type %q, Status %q (err: %q)", packagevariant.ConditionTypeAtomicPVOperations, packagevariant.ConditionPipelinePVRevisionReady, err)
require.NotNil(t, downstreamPr, "no PackageRevision found with Condition of Type %q, Status %q", packagevariant.ConditionTypeAtomicPVOperations, packagevariant.ConditionPipelinePVRevisionReady)

// Propose the PR again - should succeed this time
downstreamPr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
Expand Down

0 comments on commit cdf244c

Please sign in to comment.