Skip to content

Commit 06f9878

Browse files
authored
CLOUDP-126530. split long tests (#567)
1 parent a4fb535 commit 06f9878

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.github/workflows/test-forked.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
with:
6363
path: ~/go/pkg/mod
6464
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
65+
6566
- name: Run testing
6667
uses: ./.github/actions/int-test
6768
with:
@@ -149,13 +150,12 @@ jobs:
149150
"helm-ns",
150151
"helm-wide",
151152
"helm-update",
152-
"helm-advanced-cluster",
153-
"helm-advanced-cluster-multi-region",
154153
"serverless-instance",
155154
"multinamespaced",
156155
"privatelink",
157156
"integration-ns",
158157
"x509auth",
158+
"long-run",
159159
]
160160
include:
161161
- k8s: "latest-openshift"
@@ -272,9 +272,12 @@ jobs:
272272
helm version
273273
go version
274274
275-
go install github.com/onsi/ginkgo/v2/[email protected].1 && \
275+
go install github.com/onsi/ginkgo/v2/[email protected].4 && \
276276
go install github.com/onsi/gomega/...
277-
ginkgo --label-filter="${TEST_NAME}" --timeout 120m --nodes=10 -v test/e2e/
277+
278+
# no `long-run`, no `broken` tests. `Long-run` tests run as a separate job
279+
[[ $test == 'long-run' ]] && filter='long-run && !broken' || filter="$test"' && !long-run && !broken'
280+
ginkgo --label-filter=\'"${filter}"\' --timeout 120m --nodes=10 -v test/e2e/
278281
279282
- name: Upload operator logs
280283
if: ${{ failure() }}

.github/workflows/test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,12 @@ jobs:
149149
"helm-ns",
150150
"helm-wide",
151151
"helm-update",
152-
"helm-advanced-cluster",
153-
"helm-advanced-cluster-multi-region",
154152
"serverless-instance",
155153
"multinamespaced",
156154
"privatelink",
157155
"integration-ns",
158156
"x509auth",
157+
"long-run",
159158
]
160159
include:
161160
- k8s: "latest-openshift"
@@ -270,9 +269,12 @@ jobs:
270269
helm version
271270
go version
272271
273-
go install github.com/onsi/ginkgo/v2/[email protected].1 && \
272+
go install github.com/onsi/ginkgo/v2/[email protected].4 && \
274273
go install github.com/onsi/gomega/...
275-
ginkgo --label-filter="${TEST_NAME}" --timeout 120m --nodes=10 -v test/e2e/
274+
275+
# no `long-run`, no `broken` tests. `Long-run` tests run as a separate job
276+
[[ $test == 'long-run' ]] && filter='long-run && !broken' || filter="$test"' && !long-run && !broken'
277+
ginkgo --label-filter=\'"${filter}"\' --timeout 120m --nodes=10 -v test/e2e/
276278
277279
- name: Upload operator logs
278280
if: ${{ failure() }}

test/e2e/configuration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var _ = Describe("Configuration namespaced. Deploy deployment", Label("deploymen
6868
},
6969
),
7070
),
71-
Entry("Almost Production - Backup and 2 DB users: one Admin and one read-only", Label("ns-backup2db"),
71+
Entry("Almost Production - Backup and 2 DB users: one Admin and one read-only", Label("ns-backup2db", "long-run"),
7272
model.NewTestDataProvider(
7373
"operator-ns-prodlike",
7474
model.AProject{},
@@ -151,7 +151,7 @@ var _ = Describe("Configuration namespaced. Deploy deployment", Label("deploymen
151151
},
152152
),
153153
),
154-
Entry("Product Owner - Simplest configuration with ProjectOwner and update Deployment to have backup", Label("ns-owner"),
154+
Entry("Product Owner - Simplest configuration with ProjectOwner and update deployment to have backup", Label("ns-owner", "long-run"),
155155
model.NewTestDataProvider(
156156
"operator-ns-product-owner",
157157
model.AProject{},

test/e2e/helm_chart_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ var _ = Describe("HELM charts", func() {
115115
),
116116
"default",
117117
),
118-
Entry("Advanced deployment by helm chart",
118+
Entry("Advanced deployment by helm chart", Label("helm-advanced"),
119119
model.NewTestDataProvider(
120120
"helm-advanced",
121121
model.AProject{},
@@ -133,7 +133,7 @@ var _ = Describe("HELM charts", func() {
133133
),
134134
"advanced",
135135
),
136-
Entry("Advanced multiregion deployment by helm chart",
136+
Entry("Advanced multiregion deployment by helm chart", Label("helm-advanced-multiregion"),
137137
model.NewTestDataProvider(
138138
"helm-advanced-multiregion",
139139
model.AProject{},
@@ -151,7 +151,7 @@ var _ = Describe("HELM charts", func() {
151151
),
152152
"advanced",
153153
),
154-
Entry("Serverless deployment by helm chart",
154+
Entry("Serverless deployment by helm chart", Label("helm-serverless"),
155155
model.NewTestDataProvider(
156156
"helm-serverless",
157157
model.AProject{},

0 commit comments

Comments
 (0)