Skip to content

Commit 189a3b0

Browse files
JeromeJuJeromeJu
committed
Debugging test failures after swapping to minimal
1 parent 0f42ebf commit 189a3b0

File tree

6 files changed

+37
-34
lines changed

6 files changed

+37
-34
lines changed

‎pkg/apis/config/feature_flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const (
7979
// DefaultSendCloudEventsForRuns is the default value for "send-cloudevents-for-runs".
8080
DefaultSendCloudEventsForRuns = false
8181
// DefaultEmbeddedStatus is the default value for "embedded-status".
82-
DefaultEmbeddedStatus = FullEmbeddedStatus
82+
DefaultEmbeddedStatus = MinimalEmbeddedStatus
8383
// DefaultEnableSpire is the default value for "enable-spire".
8484
DefaultEnableSpire = false
8585
// DefaultResourceVerificationMode is the default value for "resource-verification-mode".

‎pkg/apis/config/feature_flags_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func TestNewFeatureFlagsFromConfigMap(t *testing.T) {
143143
{
144144
expectedConfig: &config.FeatureFlags{
145145
EnableAPIFields: "stable",
146-
EmbeddedStatus: "full",
146+
EmbeddedStatus: config.DefaultEmbeddedStatus,
147147
EnableCustomTasks: config.DefaultEnableCustomTasks,
148148
EnableSpire: true,
149149
ResourceVerificationMode: config.DefaultResourceVerificationMode,
@@ -158,7 +158,7 @@ func TestNewFeatureFlagsFromConfigMap(t *testing.T) {
158158
{
159159
expectedConfig: &config.FeatureFlags{
160160
EnableAPIFields: "stable",
161-
EmbeddedStatus: "full",
161+
EmbeddedStatus: config.DefaultEmbeddedStatus,
162162
ResourceVerificationMode: config.DefaultResourceVerificationMode,
163163
RunningInEnvWithInjectedSidecars: config.DefaultRunningInEnvWithInjectedSidecars,
164164
AwaitSidecarReadiness: config.DefaultAwaitSidecarReadiness,

‎pkg/apis/pipeline/v1beta1/pipelinerun_conversion_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,6 @@ func TestPipelineRunConversionFromDeprecated(t *testing.T) {
454454
}
455455
}
456456

457-
// Assumptions: The `embedded-status` is defaulted as `Full` as in config.DefaultEmbeddedStatus:
458457
func TestPipelineRunConversionEmbeddedStatusRoundTrip(t *testing.T) {
459458
taskRuns["tr-0"] = trs
460459
runs["r-0"] = rrs

‎pkg/reconciler/pipelinerun/cancel_test.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ func TestCancelPipelineRun(t *testing.T) {
4646
customRuns []*v1beta1.CustomRun
4747
wantErr bool
4848
}{{
49-
name: "no-resolved-taskrun",
50-
embeddedStatus: config.DefaultEmbeddedStatus,
49+
name: "no-resolved-taskrun-with-full",
50+
embeddedStatus: config.FullEmbeddedStatus,
5151
pipelineRun: &v1beta1.PipelineRun{
5252
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
5353
Spec: v1beta1.PipelineRunSpec{
5454
Status: v1beta1.PipelineRunSpecStatusCancelled,
5555
},
5656
},
5757
}, {
58-
name: "one-taskrun",
59-
embeddedStatus: config.DefaultEmbeddedStatus,
58+
name: "one-taskrun-with-full",
59+
embeddedStatus: config.FullEmbeddedStatus,
6060
pipelineRun: &v1beta1.PipelineRun{
6161
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
6262
Spec: v1beta1.PipelineRunSpec{
@@ -72,8 +72,8 @@ func TestCancelPipelineRun(t *testing.T) {
7272
{ObjectMeta: metav1.ObjectMeta{Name: "t1"}},
7373
},
7474
}, {
75-
name: "multiple-taskruns-one-missing",
76-
embeddedStatus: config.DefaultEmbeddedStatus,
75+
name: "multiple-taskruns-one-missing-with-full",
76+
embeddedStatus: config.FullEmbeddedStatus,
7777
pipelineRun: &v1beta1.PipelineRun{
7878
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
7979
Spec: v1beta1.PipelineRunSpec{
@@ -90,8 +90,8 @@ func TestCancelPipelineRun(t *testing.T) {
9090
{ObjectMeta: metav1.ObjectMeta{Name: "t2"}},
9191
},
9292
}, {
93-
name: "multiple-taskruns",
94-
embeddedStatus: config.DefaultEmbeddedStatus,
93+
name: "multiple-taskruns-with-full",
94+
embeddedStatus: config.FullEmbeddedStatus,
9595
pipelineRun: &v1beta1.PipelineRun{
9696
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
9797
Spec: v1beta1.PipelineRunSpec{
@@ -109,8 +109,8 @@ func TestCancelPipelineRun(t *testing.T) {
109109
{ObjectMeta: metav1.ObjectMeta{Name: "t2"}},
110110
},
111111
}, {
112-
name: "multiple-runs",
113-
embeddedStatus: config.DefaultEmbeddedStatus,
112+
name: "multiple-runs-with-full",
113+
embeddedStatus: config.FullEmbeddedStatus,
114114
pipelineRun: &v1beta1.PipelineRun{
115115
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
116116
Spec: v1beta1.PipelineRunSpec{
@@ -128,8 +128,8 @@ func TestCancelPipelineRun(t *testing.T) {
128128
{ObjectMeta: metav1.ObjectMeta{Name: "t2"}},
129129
},
130130
}, {
131-
name: "multiple-runs-one-missing",
132-
embeddedStatus: config.DefaultEmbeddedStatus,
131+
name: "multiple-runs-one-missing-with-full",
132+
embeddedStatus: config.FullEmbeddedStatus,
133133
pipelineRun: &v1beta1.PipelineRun{
134134
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
135135
Spec: v1beta1.PipelineRunSpec{
@@ -227,7 +227,7 @@ func TestCancelPipelineRun(t *testing.T) {
227227
},
228228
}, {
229229
name: "child-references-with-minimal",
230-
embeddedStatus: config.MinimalEmbeddedStatus,
230+
embeddedStatus: config.DefaultEmbeddedStatus,
231231
pipelineRun: &v1beta1.PipelineRun{
232232
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
233233
Spec: v1beta1.PipelineRunSpec{
@@ -268,7 +268,7 @@ func TestCancelPipelineRun(t *testing.T) {
268268
},
269269
}, {
270270
name: "child-references-with-minimal-some-missing",
271-
embeddedStatus: config.MinimalEmbeddedStatus,
271+
embeddedStatus: config.DefaultEmbeddedStatus,
272272
pipelineRun: &v1beta1.PipelineRun{
273273
ObjectMeta: metav1.ObjectMeta{Name: "test-pipeline-run-cancelled"},
274274
Spec: v1beta1.PipelineRunSpec{
@@ -459,8 +459,8 @@ func TestGetChildObjectsFromPRStatusForTaskNames(t *testing.T) {
459459
hasError bool
460460
}{
461461
{
462-
name: "single taskrun, default embedded",
463-
embeddedStatus: config.DefaultEmbeddedStatus,
462+
name: "single taskrun, full embedded",
463+
embeddedStatus: config.FullEmbeddedStatus,
464464
prStatus: v1beta1.PipelineRunStatus{PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
465465
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
466466
"t1": {PipelineTaskName: "task-1"},
@@ -471,8 +471,8 @@ func TestGetChildObjectsFromPRStatusForTaskNames(t *testing.T) {
471471
expectedCustomRunNames: nil,
472472
hasError: false,
473473
}, {
474-
name: "single run, default embedded",
475-
embeddedStatus: config.DefaultEmbeddedStatus,
474+
name: "single run, full embedded",
475+
embeddedStatus: config.FullEmbeddedStatus,
476476
prStatus: v1beta1.PipelineRunStatus{PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
477477
Runs: map[string]*v1beta1.PipelineRunRunStatus{
478478
"r1": {PipelineTaskName: "run-1"},
@@ -482,8 +482,8 @@ func TestGetChildObjectsFromPRStatusForTaskNames(t *testing.T) {
482482
expectedRunNames: []string{"r1"},
483483
hasError: false,
484484
}, {
485-
name: "taskrun and run, default embedded",
486-
embeddedStatus: config.DefaultEmbeddedStatus,
485+
name: "taskrun and run, full embedded",
486+
embeddedStatus: config.FullEmbeddedStatus,
487487
prStatus: v1beta1.PipelineRunStatus{PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
488488
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
489489
"t1": {PipelineTaskName: "task-1"},
@@ -496,8 +496,8 @@ func TestGetChildObjectsFromPRStatusForTaskNames(t *testing.T) {
496496
expectedRunNames: []string{"r1"},
497497
hasError: false,
498498
}, {
499-
name: "taskrun and run, default embedded, just want taskrun",
500-
embeddedStatus: config.DefaultEmbeddedStatus,
499+
name: "taskrun and run, full embedded, just want taskrun",
500+
embeddedStatus: config.FullEmbeddedStatus,
501501
prStatus: v1beta1.PipelineRunStatus{PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
502502
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{
503503
"t1": {PipelineTaskName: "task-1"},
@@ -549,7 +549,7 @@ func TestGetChildObjectsFromPRStatusForTaskNames(t *testing.T) {
549549
expectedRunNames: []string{"r1"},
550550
hasError: false,
551551
}, {
552-
name: "minimal embedded",
552+
name: "default minimal embedded",
553553
embeddedStatus: config.MinimalEmbeddedStatus,
554554
prStatus: v1beta1.PipelineRunStatus{PipelineRunStatusFields: v1beta1.PipelineRunStatusFields{
555555
TaskRuns: map[string]*v1beta1.PipelineRunTaskRunStatus{

‎pkg/reconciler/pipelinerun/pipelinerun.go

+10-7
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ var (
163163
func (c *Reconciler) ReconcileKind(ctx context.Context, pr *v1beta1.PipelineRun) pkgreconciler.Event {
164164
logger := logging.FromContext(ctx)
165165
ctx = cloudevent.ToContext(ctx, c.cloudEventClient)
166+
cfg := config.FromContextOrDefaults(ctx)
166167

167168
// Read the initial condition
168169
before := pr.Status.GetCondition(apis.ConditionSucceeded)
@@ -204,13 +205,15 @@ func (c *Reconciler) ReconcileKind(ctx context.Context, pr *v1beta1.PipelineRun)
204205
logger.Errorf("Failed to delete StatefulSet for PipelineRun %s: %v", pr.Name, err)
205206
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, err)
206207
}
207-
if err := c.updateTaskRunsStatusDirectly(pr); err != nil {
208-
logger.Errorf("Failed to update TaskRun status for PipelineRun %s: %v", pr.Name, err)
209-
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, err)
210-
}
211-
if err := c.updateRunsStatusDirectly(pr); err != nil {
212-
logger.Errorf("Failed to update Run status for PipelineRun %s: %v", pr.Name, err)
213-
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, err)
208+
if cfg.FeatureFlags.EmbeddedStatus == config.FullEmbeddedStatus || cfg.FeatureFlags.EmbeddedStatus == config.BothEmbeddedStatus {
209+
if err := c.updateTaskRunsStatusDirectly(pr); err != nil {
210+
logger.Errorf("Failed to update TaskRun status for PipelineRun %s: %v", pr.Name, err)
211+
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, err)
212+
}
213+
if err := c.updateRunsStatusDirectly(pr); err != nil {
214+
logger.Errorf("Failed to update Run status for PipelineRun %s: %v", pr.Name, err)
215+
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, err)
216+
}
214217
}
215218
return c.finishReconcileUpdateEmitEvents(ctx, pr, before, nil)
216219
}

‎pkg/reconciler/pipelinerun/pipelinerun_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -1836,6 +1836,7 @@ status:
18361836
}
18371837
}
18381838

1839+
// TODO
18391840
func TestReconcileForCustomTaskWithPipelineRunTimedOut(t *testing.T) {
18401841
names.TestingSeed()
18411842
// TestReconcileForCustomTaskWithPipelineRunTimedOut runs "Reconcile" on a

0 commit comments

Comments
 (0)