Skip to content

Commit

Permalink
fix: re-add k8s install e2e (#3530)
Browse files Browse the repository at this point in the history
  • Loading branch information
blva authored Jan 14, 2025
1 parent 2677b79 commit e021ea5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
18 changes: 18 additions & 0 deletions build/ci/evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,24 @@ tasks:
MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
MCLI_SERVICE: cloud
E2E_TAGS: atlas,cluster,kubernetes,apply
- name: atlas_kubernetes_install_e2e
tags: [ "e2e","atlas","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
must_have_test_results: true
depends_on:
- name: atlas_clusters_flags_e2e
variant: "e2e_atlas_clusters"
patch_optional: true
commands:
- func: "install gotestsum"
- func: "e2e test"
vars:
MCLI_ORG_ID: ${atlas_org_id}
MCLI_PROJECT_ID: ${atlas_project_id}
MCLI_PRIVATE_API_KEY: ${atlas_private_api_key}
MCLI_PUBLIC_API_KEY: ${atlas_public_api_key}
MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
MCLI_SERVICE: cloud
E2E_TAGS: atlas,cluster,kubernetes,local
- name: atlas_clusters_upgrade_e2e
tags: ["e2e","clusters","atlas"]
must_have_test_results: true
Expand Down
5 changes: 5 additions & 0 deletions test/e2e/atlas/helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"testing"
"time"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/kubernetes/operator/resources"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/plugin"
"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -1372,3 +1373,7 @@ func deleteAllIDPs(t *testing.T, cliPath string) {
deleteIDP(t, cliPath, idp.Id, fedSettingsID)
}
}

func prepareK8sName(pattern string) string {
return resources.NormalizeAtlasName(pattern, resources.AtlasNameToKubernetesName())
}
5 changes: 0 additions & 5 deletions test/e2e/atlas/kubernetes_config_apply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"testing"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/kubernetes/operator/features"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/kubernetes/operator/resources"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
Expand Down Expand Up @@ -502,7 +501,3 @@ func deleteTeamFromProject(t *testing.T, cliPath, projectID, teamID string) {
resp, err := cmd.CombinedOutput()
require.NoError(t, err, string(resp))
}

func prepareK8sName(pattern string) string {
return resources.NormalizeAtlasName(pattern, resources.AtlasNameToKubernetesName())
}

0 comments on commit e021ea5

Please sign in to comment.