Skip to content

Commit f30c8f4

Browse files
committed
Skip flaky tests
Signed-off-by: perdasilva <[email protected]>
1 parent dbf0c02 commit f30c8f4

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-go@v2
2020
with:
2121
go-version: '~1.17'
22-
- run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACTS_DIR=./artifacts/
22+
- run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACTS_DIR=./artifacts/ SKIP='\[FLAKY\]'
2323
- name: Archive Test Artifacts # test results, failed or not, are always uploaded.
2424
if: ${{ always() }}
2525
uses: actions/upload-artifact@v2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ E2E_TEST_NUM_CHUNKS ?= 4
131131
ifneq (all,$(E2E_TEST_CHUNK))
132132
TEST := $(shell go run ./test/e2e/split/... -chunks $(E2E_TEST_NUM_CHUNKS) -print-chunk $(E2E_TEST_CHUNK) ./test/e2e)
133133
endif
134-
E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)') -flakeAttempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomizeSuites -race -trace -progress
134+
E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(SKIP), -skip '$(SKIP)') $(if $(TEST),-focus '$(TEST)') -flakeAttempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomizeSuites -race -trace -progress
135135
E2E_INSTALL_NS ?= operator-lifecycle-manager
136136
E2E_TEST_NS ?= operators
137137

test/e2e/crd_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var _ = Describe("CRD Versions", func() {
9494
Expect(fetchedInstallPlan.Status.Phase).To(Equal(operatorsv1alpha1.InstallPlanPhaseComplete))
9595
})
9696

97-
It("blocks a CRD upgrade that could cause data loss", func() {
97+
It("[FLAKY] blocks a CRD upgrade that could cause data loss", func() {
9898
By("checking the storage versions in the existing CRD status and the spec of the new CRD")
9999

100100
c := newKubeClient()

test/e2e/csv_e2e_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"k8s.io/apimachinery/pkg/api/equality"
2020
k8serrors "k8s.io/apimachinery/pkg/api/errors"
2121
"k8s.io/apimachinery/pkg/api/meta"
22-
"k8s.io/apimachinery/pkg/fields"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23+
"k8s.io/apimachinery/pkg/fields"
2424
k8slabels "k8s.io/apimachinery/pkg/labels"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apimachinery/pkg/selection"
@@ -64,10 +64,10 @@ var _ = Describe("ClusterServiceVersion", func() {
6464

6565
When("a CustomResourceDefinition was installed alongside a ClusterServiceVersion", func() {
6666
var (
67-
ns corev1.Namespace
68-
crd apiextensionsv1.CustomResourceDefinition
69-
og operatorsv1.OperatorGroup
70-
apiname string
67+
ns corev1.Namespace
68+
crd apiextensionsv1.CustomResourceDefinition
69+
og operatorsv1.OperatorGroup
70+
apiname string
7171
apifullname string
7272
)
7373

@@ -144,7 +144,7 @@ var _ = Describe("ClusterServiceVersion", func() {
144144
}).Should(WithTransform(k8serrors.IsNotFound, BeTrue()))
145145
})
146146

147-
It("can satisfy an associated ClusterServiceVersion's ownership requirement", func() {
147+
It("[FLAKY] can satisfy an associated ClusterServiceVersion's ownership requirement", func() {
148148
associated := operatorsv1alpha1.ClusterServiceVersion{
149149
ObjectMeta: metav1.ObjectMeta{
150150
Name: "associated-csv",
@@ -261,7 +261,7 @@ var _ = Describe("ClusterServiceVersion", func() {
261261
}).Should(Succeed())
262262
})
263263

264-
It("can satisfy an unassociated ClusterServiceVersion's non-ownership requirement", func() {
264+
It("[FLAKY] can satisfy an unassociated ClusterServiceVersion's non-ownership requirement", func() {
265265
unassociated := operatorsv1alpha1.ClusterServiceVersion{
266266
ObjectMeta: metav1.ObjectMeta{
267267
Name: "unassociated-csv",
@@ -4206,7 +4206,7 @@ var _ = Describe("ClusterServiceVersion", func() {
42064206

42074207
var _ = Describe("Disabling copied CSVs", func() {
42084208
var (
4209-
ns corev1.Namespace
4209+
ns corev1.Namespace
42104210
csv operatorsv1alpha1.ClusterServiceVersion
42114211
)
42124212

@@ -4391,7 +4391,7 @@ var _ = Describe("Disabling copied CSVs", func() {
43914391
}).Should(Succeed())
43924392
})
43934393

4394-
It("should have copied CSVs in all other Namespaces", func() {
4394+
It("[FLAKY] should have copied CSVs in all other Namespaces", func() {
43954395
Eventually(func() error {
43964396
// find copied csvs...
43974397
requirement, err := k8slabels.NewRequirement(operatorsv1alpha1.CopiedLabelKey, selection.Equals, []string{csv.GetNamespace()})

test/e2e/subscription_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ var _ = Describe("Subscription", func() {
10221022
// - Delete the referenced InstallPlan
10231023
// - Wait for sub to have status condition SubscriptionInstallPlanMissing true
10241024
// - Ensure original non-InstallPlan status conditions remain after InstallPlan transitions
1025-
It("can reconcile InstallPlan status", func() {
1025+
It("[FLAKY] can reconcile InstallPlan status", func() {
10261026
c := newKubeClient()
10271027
crc := newCRClient()
10281028

0 commit comments

Comments
 (0)