CLOUDP-101199: Improve Flakiness of Cloud Manager tests in MongoCLI (#880)

Author: fmenezes

build/ci/clean-up-cloud-manager.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright 2021 MongoDB Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+# shellcheck disable=SC1091
+source project.sh
+
+mongocli iam projects remove "$MCLI_PROJECT_ID"

build/ci/evergreen.yml

@@ -175,6 +175,39 @@ functions:
         args: ['-h', 'hosts.json']
         env:
           XDG_CONFIG_HOME: ${workdir}
+  "set-up cloud manager":
+    - command: subprocess.exec
+      type: setup
+      params:
+        add_to_path:
+          - ${go_bin}
+          - ../../bin
+        working_dir: src/github.com/mongodb/mongocli/build/ci
+        include_expansions_in_env:
+          - cloud_manager_service
+          - revision
+        binary: ./set-up-cloud-manager.sh
+        args: ['-h', 'hosts.json']
+        env:
+          XDG_CONFIG_HOME: ${workdir}
+          MCLI_ORG_ID: ${cloud_manager_org_id}
+          MCLI_PROJECT_ID: ${cloud_manager_project_id}
+          MCLI_PRIVATE_API_KEY: ${cloud_manager_private_api_key}
+          MCLI_PUBLIC_API_KEY: ${cloud_manager_public_api_key}
+          MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
+          MCLI_SERVICE: cloud-manager
+  "clean-up cloud manager":
+    - command: subprocess.exec
+      type: setup
+      params:
+        add_to_path:
+          - ${go_bin}
+          - ../../bin
+        working_dir: src/github.com/mongodb/mongocli/build/ci
+        binary: ./clean-up-cloud-manager.sh
+        args: ['-h', 'hosts.json']
+        env:
+          XDG_CONFIG_HOME: ${workdir}
   "lint":
     - command: shell.exec
       type: test
@@ -1073,18 +1106,15 @@ tasks:
     commands:
       - func: "clone"
       - func: "install gotestsum"
+      - func: "build"
       - func: "deploy spawn host"
       - func: ssh-ready
+      - func: "set-up cloud manager"
       - func: "install automation agent"
       - func: "e2e test"
         vars:
-          MCLI_ORG_ID: ${cloud_manager_org_id}
-          MCLI_PROJECT_ID: ${cloud_manager_project_id}
-          MCLI_PRIVATE_API_KEY: ${cloud_manager_private_api_key}
-          MCLI_PUBLIC_API_KEY: ${cloud_manager_public_api_key}
-          MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
-          MCLI_SERVICE: cloud-manager
           E2E_TAGS: cloudmanager,remote,replica
+      - func: "clean-up cloud manager"
   # Deploy a sharded cluster, we need to be careful on running parallel modifications to the automation config
   - name: cloud_manager_deploy_sharded_cluster_e2e
     tags: ["e2e","clusters","cloudmanager"]
@@ -1098,18 +1128,15 @@ tasks:
     commands:
       - func: "clone"
       - func: "install gotestsum"
+      - func: "build"
       - func: "deploy spawn host"
       - func: ssh-ready
+      - func: "set-up cloud manager"
       - func: "install automation agent"
       - func: "e2e test"
         vars:
-          MCLI_ORG_ID: ${cloud_manager_org_id}
-          MCLI_PROJECT_ID: ${cloud_manager_project_id}
-          MCLI_PRIVATE_API_KEY: ${cloud_manager_private_api_key}
-          MCLI_PUBLIC_API_KEY: ${cloud_manager_public_api_key}
-          MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
-          MCLI_SERVICE: cloud-manager
           E2E_TAGS: cloudmanager,remote,sharded
+      - func: "clean-up cloud manager"
   # Deploy ops manager and test against it
   - name: ops_manager_4_4_generic_e2e
     tags: [ "e2e","ops-manager-44" ]

build/ci/set-up-cloud-manager.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Copyright 2021 MongoDB Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+export MCLI_SERVICE="${cloud_manager_service:?}"
+
+cat <<EOF > "${XDG_CONFIG_HOME}/mongocli.toml"
+skip_update_check = true
+[default]
+  service = "${MCLI_SERVICE}"
+  public_api_key = "${MCLI_PUBLIC_API_KEY}"
+  private_api_key = "${MCLI_PRIVATE_API_KEY}"
+  org_id = "${MCLI_ORG_ID}"
+  ops_manager_url = "${MCLI_OPS_MANAGER_URL}"
+
+EOF
+
+
+echo "create project"
+
+cat <<EOF > project.tmpl
+#!/bin/bash
+
+set -euo pipefail
+
+export AGENT_API_KEY="{{.AgentAPIKey}}"
+export MCLI_PROJECT_ID="{{.ID}}"
+EOF
+
+# shellcheck disable=SC2154
+GROUP_NAME="cloudManager-e2e-$((1 + RANDOM % 1000))-$revision"
+mongocli iam projects create "$GROUP_NAME" -o="go-template-file=project.tmpl" > project.sh
+
+chmod +x project.sh
+
+# shellcheck disable=SC1091
+source project.sh
+
+mongocli config set project_id "$MCLI_PROJECT_ID"
+
+cat <<EOF > automation_agent_settings.sh
+export BASE_URL=${MCLI_OPS_MANAGER_URL}
+export LC_AGENT_KEY=${AGENT_API_KEY}
+export LC_GROUP_ID=${MCLI_PROJECT_ID}
+export MCLI_SERVICE=${MCLI_SERVICE}
+EOF