Skip to content

Commit bbac1c7

Browse files
authored
Revert "CLOUDP-32590: Run all e2e2 tests on nightlies (#2400)" (#2402)
This reverts commit ca3d275.
1 parent ca3d275 commit bbac1c7

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

.github/codecov.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ component_management:
2828
paths:
2929
- "!tests/"
3030
- "!tools/"
31-
statuses:
32-
- type: project
33-
threshold: -0.5 # Allow -0.5% regression in coverage
34-
carryforward: false
35-
target: auto
36-
informational: true
37-
- type: patch
3831
- component_id: test-helpers
3932
name: test-helpers
4033
paths:

.github/workflows/tests-e2e2.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@ jobs:
7474
E2E2_LABELS: ${{ env.e2e2_labels }}
7575
USE_JSON: true
7676
run: |
77-
PR_LABELS=${{ env.PR_LABELS }}
78-
# Nightly runs all tests, overriding PR labels as '["test/e2e2/*"]'
79-
if [ "${{ github.ref }}" == "refs/heads/main" ];then
80-
PR_LABELS='["test/e2e2/*"]'
81-
echo "Nightly runs all tests"
82-
fi
8377
echo PR_LABELS=${{ env.PR_LABELS }}
8478
echo E2E2_LABELS=${{ env.E2E2_LABELS }}
8579
make compute-labels
@@ -100,10 +94,8 @@ jobs:
10094
run: |
10195
# Note the use of external single quotes to allow for double quotes at inline YAML array
10296
matrix='["v1.30.10-kind"]'
103-
# Nightly runs in both the newest and oldest supported Kubernetes versions
10497
if [ "${{ github.ref }}" == "refs/heads/main" ];then
10598
matrix='["v1.30.10-kind", "v1.32.2-kind"]'
106-
echo "Nightly runs oldest and newest Kubernetes supported versions"
10799
fi
108100
echo "matrix=${matrix}" >> "${GITHUB_OUTPUT}"
109101
cat "${GITHUB_OUTPUT}"

test/e2e2/integration_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,53 +160,62 @@ var _ = Describe("Atlas Third-Party Integrations Controller", Ordered, Label("in
160160
})
161161
},
162162
Entry("Test[datadog]: Datadog integration with a parent project",
163+
Label("datadog"),
163164
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/datadog.sample.yml")),
164165
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/datadog.update.yml")),
165166
"atlas-datadog-integ",
166167
),
167168
Entry("Test[msteams]: Microsoft Teams integration with a parent project",
169+
Label("msteams"),
168170
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/msteams.sample.yml")),
169171
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/msteams.update.yml")),
170172
"atlas-msteams-integ",
171173
),
172174
Entry("Test[newrelic]: New Relic integration with a parent project",
175+
Label("newrelic"),
173176
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/newrelic.sample.yml")),
174177
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/newrelic.update.yml")),
175178
"atlas-newrelic-integ",
176179
),
177180
Entry("Test[opsgenie]: Ops Genie integration with a parent project",
181+
Label("opsgenie"),
178182
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/opsgenie.sample.yml")),
179183
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/opsgenie.update.yml")),
180184
"atlas-opsgenie-integ",
181185
),
182186
Entry("Test[pagerduty]: PagerDuty integration with a parent project",
187+
Label("pagerduty"),
183188
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/pagerduty.sample.yml")),
184189
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/pagerduty.update.yml")),
185190
"atlas-pagerduty-integ",
186191
),
187192
Entry("Test[prometheus]: Prometheus integration with a parent project",
193+
Label("prometheus"),
188194
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/prometheus.sample.yml")),
189195
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/prometheus.update.yml")),
190196
"atlas-prometheus-integ",
191197
),
192198
Entry("Test[slack]: Slack integration with a parent project",
199+
Label("slack"),
193200
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/slack.sample.yml")),
194201
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/slack.update.yml")),
195202
"atlas-slack-integ",
196203
),
197204
Entry("Test[victorops]: Victor Ops integration with a parent project",
205+
Label("victorops"),
198206
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/victorops.sample.yml")),
199207
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/victorops.update.yml")),
200208
"atlas-victorops-integ",
201209
),
202210
Entry("Test[webhook]: Webhooks integration with a parent project",
211+
Label("webhook"),
203212
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/webhook.sample.yml")),
204213
yml.MustParseObjects(yml.MustOpen(integrations, "integrations/webhook.update.yml")),
205214
"atlas-webhook-integ",
206215
),
207216
)
208217

209-
It("Can handle isolated integrations", func() {
218+
It("Can handle isolated integrations", Label("isolated-integration"), func() {
210219
project := akov2.AtlasProject{
211220
TypeMeta: v1.TypeMeta{Kind: "AtlasProject", APIVersion: akov2.GroupVersion.String()},
212221
ObjectMeta: v1.ObjectMeta{Name: "atlas-project", Namespace: testNamespace.Name},

0 commit comments

Comments
 (0)