Skip to content

Commit

Permalink
[v0.10] Convert drift e2e tests into integration tests (#2913)
Browse files Browse the repository at this point in the history
* Convert drift e2e tests into integration tests (#2861)

* Simplify drift correction integration tests

This removes checks on bundle statuses, which are unrelated to drift
correction and already covered in status tests
(`integrationtests/agent/bundle_deployment_status_test.go`).

* Migrate drift correction end-to-end tests

This migrates end-to-end test cases for drift correction to
integration tests, simplifying them and reducing the risk of flakiness.

* Rename `createBundle` as `createBundleDeployment`

That bundle reconciler method creates bundle deployments, not bundles.

* Convert bundle deletion e2e test into integration test

That end-to-end test case was flaky, and could easily be migrated to
integration tests.

* Skip `e2e/drift` in CI workflows

That path no longer exists, therefore `ginkgo` must no longer be called
with it.
  • Loading branch information
weyfonk authored Oct 1, 2024
1 parent cefd133 commit 6f78e68
Show file tree
Hide file tree
Showing 15 changed files with 343 additions and 442 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-aks-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
FLEET_E2E_NS: fleet-local
run: |
export KUBECONFIG="$GITHUB_WORKSPACE/kubeconfig-fleet-ci"
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources e2e/drift
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources
-
name: Acceptance Tests for Examples
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
env:
FLEET_E2E_NS: fleet-local
run: |
ginkgo --github-output --label-filter='!infra-setup && !sharding' e2e/single-cluster e2e/keep-resources e2e/drift
ginkgo --github-output --label-filter='!infra-setup && !sharding' e2e/single-cluster e2e/keep-resources
-
name: E2E Sharding/Metrics Tests
if: ${{ matrix.test_type.name == 'sharding' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-gke-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
env:
FLEET_E2E_NS: fleet-local
run: |
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources e2e/drift
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources
-
name: Acceptance Tests for Examples
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-nightly-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
export CI_OCI_CERTS_DIR="$(git rev-parse --show-toplevel)/FleetCI-RootCA"
# 1. Run test cases not needing infra
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources e2e/drift
ginkgo --github-output --label-filter='!infra-setup' e2e/single-cluster e2e/keep-resources
# 2. Run tests for metrics
ginkgo --github-output e2e/metrics
Expand Down
10 changes: 0 additions & 10 deletions e2e/assets/drift/correction-disabled/gitrepo.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions e2e/assets/drift/correction-enabled/gitrepo.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions e2e/assets/drift/force/gitrepo.yaml

This file was deleted.

284 changes: 0 additions & 284 deletions e2e/drift/drift_test.go

This file was deleted.

27 changes: 0 additions & 27 deletions e2e/drift/suite_test.go

This file was deleted.

Loading

0 comments on commit 6f78e68

Please sign in to comment.