Skip to content

Commit c2448a5

Browse files
authored
Merge pull request kubernetes#33936 from BenTheElder/no-flakes
remove GINKGO_TOLERATE_FLAKES from master branch jobs
2 parents 68fef18 + f0718cd commit c2448a5

File tree

6 files changed

+0
-32
lines changed

6 files changed

+0
-32
lines changed

config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,6 @@ periodics:
13481348
value: "capz"
13491349
- name: GINKGO_PARALLEL_NODES # cloud-provider-azure config
13501350
value: "3"
1351-
- name: GINKGO_TOLERATE_FLAKES # cloud-provider-azure config
1352-
value: "y"
13531351
resources:
13541352
limits:
13551353
cpu: 4
@@ -1627,8 +1625,6 @@ periodics:
16271625
value: "capz"
16281626
- name: GINKGO_PARALLEL_NODES # cloud-provider-azure config
16291627
value: "1"
1630-
- name: GINKGO_TOLERATE_FLAKES # cloud-provider-azure config
1631-
value: "y"
16321628
resources:
16331629
limits:
16341630
cpu: 4

config/jobs/kubernetes-sigs/kind/kind.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ periodics:
5757
- -c
5858
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
5959
env:
60-
# don't retry conformance tests
61-
- name: GINKGO_TOLERATE_FLAKES
62-
value: "n"
6360
# we need privileged mode in order to do docker in docker
6461
securityContext:
6562
privileged: true
@@ -107,9 +104,6 @@ periodics:
107104
# tell kind CI script to use ipv6
108105
- name: "IP_FAMILY"
109106
value: "ipv6"
110-
# don't retry conformance tests
111-
- name: GINKGO_TOLERATE_FLAKES
112-
value: "n"
113107
# we need privileged mode in order to do docker in docker
114108
securityContext:
115109
privileged: true
@@ -148,9 +142,6 @@ periodics:
148142
# skip serial tests and run with --ginkgo-parallel
149143
- name: "PARALLEL"
150144
value: "true"
151-
# don't retry conformance tests
152-
- name: GINKGO_TOLERATE_FLAKES
153-
value: "n"
154145
command:
155146
- wrapper.sh
156147
- bash
@@ -199,9 +190,6 @@ periodics:
199190
# skip serial tests and run with --ginkgo-parallel
200191
- name: "PARALLEL"
201192
value: "true"
202-
# don't retry conformance tests
203-
- name: GINKGO_TOLERATE_FLAKES
204-
value: "n"
205193
command:
206194
- wrapper.sh
207195
- bash

config/jobs/kubernetes/sig-arch/conformance-audit.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ periodics:
2929
&& curl -sO https://raw.githubusercontent.com/ii/kind/ci-audit-logging/hack/ci/e2e-k8s.sh
3030
&& bash e2e-k8s.sh
3131
env:
32-
# don't retry conformance tests
33-
- name: GINKGO_TOLERATE_FLAKES
34-
value: "n"
3532
- name: BUILD_TYPE
3633
value: docker
3734
# we need privileged mode in order to do docker in docker

config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-kind-periodics.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ periodics:
4444
- name: KIND_CLUSTER_LOG_LEVEL
4545
# Default is 4, but we want to exercise more log calls and get more output.
4646
value: "6"
47-
# don't retry conformance tests
48-
- name: GINKGO_TOLERATE_FLAKES
49-
value: "n"
5047
- name: LABEL_FILTER
5148
value: 'Conformance && !Slow && !Disruptive && !Flaky'
5249
- name: PARALLEL

config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-presubmit.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ presubmits:
3333
curl -sSL https://github.com/kubernetes/test-infra/raw/master/experiment/kind-logs-e2e-k8s.sh >$(which e2e-k8s.sh) &&
3434
chmod u+x $(which e2e-k8s.sh) &&
3535
e2e-k8s.sh
36-
3736
env:
3837
# Options from https://github.com/kubernetes-sigs/kind/blob/d1eecc46e30cac9d35cd32dc52677ef75ec22e18/hack/ci/e2e-k8s.sh#L79-L83
3938
- name: CLUSTER_LOG_FORMAT
@@ -43,9 +42,6 @@ presubmits:
4342
value: "6"
4443
- name: FEATURE_GATES
4544
value: '{"ContextualLogging":true}'
46-
# don't retry conformance tests
47-
- name: GINKGO_TOLERATE_FLAKES
48-
value: "n"
4945
- name: FOCUS
5046
value: \[Conformance\]|\[Driver:.csi-hostpath\]
5147
# TODO(bentheelder): reduce the skip list further
@@ -111,9 +107,6 @@ presubmits:
111107
value: "6"
112108
- name: FEATURE_GATES
113109
value: '{"ContextualLogging":true}'
114-
# don't retry conformance tests
115-
- name: GINKGO_TOLERATE_FLAKES
116-
value: "n"
117110
- name: FOCUS
118111
value: \[Conformance\]|\[Driver:.csi-hostpath\]
119112
# TODO(bentheelder): reduce the skip list further

config/jobs/kubernetes/sig-network/sig-network-kind.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,6 @@ periodics:
493493
- -c
494494
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
495495
env:
496-
# don't retry network tests
497-
- name: GINKGO_TOLERATE_FLAKES
498-
value: "n"
499496
- name: KUBE_PROXY_MODE
500497
value: "nftables"
501498
- name: "PARALLEL"

0 commit comments

Comments
 (0)