forked from tektoncd/pipeline
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request tektoncd#539 from chmouel/update-patches
Regenerate openshift patches
- Loading branch information
Showing
2 changed files
with
23 additions
and
53 deletions.
There are no files selected for viewing
36 changes: 11 additions & 25 deletions
36
openshift/patches/0001-Remove-TestTaskRunRetry-too-much-flakyness.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,24 @@ | ||
From cd0c10a3a1eaae979121959146b439c9aa373e62 Mon Sep 17 00:00:00 2001 | ||
From: Chmouel Boudjnah <chmouel@redhat.com> | ||
Date: Fri, 17 Apr 2020 08:48:19 +0200 | ||
Subject: [PATCH] Remove TestTaskRunRetry, too much flakyness | ||
|
||
Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com> | ||
--- | ||
test/retry_test.go | 1 + | ||
test/v1alpha1/retry_test.go | 1 + | ||
2 files changed, 2 insertions(+) | ||
|
||
diff --git a/test/retry_test.go b/test/retry_test.go | ||
index cce0874b8..3169c2016 100644 | ||
index ce6625d83..48bd910ef 100644 | ||
--- a/test/retry_test.go | ||
+++ b/test/retry_test.go | ||
@@ -33,6 +33,7 @@ import ( | ||
@@ -34,6 +34,7 @@ import ( | ||
// TestTaskRunRetry tests that retries behave as expected, by creating multiple | ||
// Pods for the same TaskRun each time it fails, up to the configured max. | ||
func TestTaskRunRetry(t *testing.T) { | ||
+ t.Skip("Flaky") | ||
c, namespace := setup(t) | ||
knativetest.CleanupOnInterrupt(func() { tearDown(t, c, namespace) }, t.Logf) | ||
defer tearDown(t, c, namespace) | ||
+ t.Skip("Flaky) | ||
ctx := context.Background() | ||
ctx, cancel := context.WithCancel(ctx) | ||
defer cancel() | ||
diff --git a/test/v1alpha1/retry_test.go b/test/v1alpha1/retry_test.go | ||
index ab7add104..a6116c6aa 100644 | ||
index 3f04ef633..7a1710be4 100644 | ||
--- a/test/v1alpha1/retry_test.go | ||
+++ b/test/v1alpha1/retry_test.go | ||
@@ -34,6 +34,7 @@ import ( | ||
@@ -35,6 +35,7 @@ import ( | ||
// TestTaskRunRetry tests that retries behave as expected, by creating multiple | ||
// Pods for the same TaskRun each time it fails, up to the configured max. | ||
func TestTaskRunRetry(t *testing.T) { | ||
+ t.Skip("Flaky") | ||
c, namespace := setup(t) | ||
knativetest.CleanupOnInterrupt(func() { tearDown(t, c, namespace) }, t.Logf) | ||
defer tearDown(t, c, namespace) | ||
-- | ||
2.25.0 | ||
|
||
ctx := context.Background() | ||
ctx, cancel := context.WithCancel(ctx) | ||
defer cancel() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,24 @@ | ||
From b64e5a7b7b9544d22946724b9a336385197ed517 Mon Sep 17 00:00:00 2001 | ||
From: Chmouel Boudjnah <chmouel@redhat.com> | ||
Date: Tue, 31 Mar 2020 18:15:06 +0200 | ||
Subject: [PATCH] Skip duplications tests | ||
|
||
They are flaky on OpenShift and runs most of the time in OOM. | ||
|
||
Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com> | ||
--- | ||
test/duplicate_test.go | 1 + | ||
test/v1alpha1/duplicate_test.go | 1 + | ||
2 files changed, 2 insertions(+) | ||
|
||
diff --git a/test/duplicate_test.go b/test/duplicate_test.go | ||
index fd19ba9d..c2e24272 100644 | ||
index 70682860e..e551d9a24 100644 | ||
--- a/test/duplicate_test.go | ||
+++ b/test/duplicate_test.go | ||
@@ -32,6 +32,7 @@ import ( | ||
@@ -33,6 +33,7 @@ import ( | ||
|
||
// TestDuplicatePodTaskRun creates 10 builds and checks that each of them has only one build pod. | ||
func TestDuplicatePodTaskRun(t *testing.T) { | ||
+ t.Skip("This consumes too much memory on openshift and is buggy") | ||
c, namespace := setup(t) | ||
t.Parallel() | ||
|
||
+ t.Skip("Too much memory used on OpenShift") | ||
ctx := context.Background() | ||
ctx, cancel := context.WithCancel(ctx) | ||
defer cancel() | ||
diff --git a/test/v1alpha1/duplicate_test.go b/test/v1alpha1/duplicate_test.go | ||
index 083dbf5c..b302191a 100644 | ||
index 19be6e7e7..24cd06167 100644 | ||
--- a/test/v1alpha1/duplicate_test.go | ||
+++ b/test/v1alpha1/duplicate_test.go | ||
@@ -31,6 +31,7 @@ import ( | ||
@@ -32,6 +32,7 @@ import ( | ||
|
||
// TestDuplicatePodTaskRun creates 10 builds and checks that each of them has only one build pod. | ||
func TestDuplicatePodTaskRun(t *testing.T) { | ||
+ t.Skip("This consumes too much memory on openshift and is buggy") | ||
c, namespace := setup(t) | ||
t.Parallel() | ||
|
||
-- | ||
2.25.0 | ||
|
||
+ t.Skip("Too much memory used on OpenShift") | ||
ctx := context.Background() | ||
ctx, cancel := context.WithCancel(ctx) | ||
defer cancel() |