wip

Author: lsierant

.githooks/pre-commit

@@ -148,7 +148,13 @@ function check_incorrect_makefile_variable_brackets() {
   fi
 }
 
+function validate_snippets() {
+  scripts/code_snippets/validate_snippets.py
+}
+
 function pre_commit() {
+  validate_snippets | prepend "validate_snippets"
+
   if [[ "${MDB_UPDATE_LICENSES:-""}" == "true" ]]; then
     ( (time update_licenses) 2>&1 | prepend "update_licenses" ) &
   fi

scripts/code_snippets/sample_commit_output.sh

@@ -13,7 +13,7 @@ if [[ "${CODE_SNIPPETS_COMMIT_OUTPUT:-"false"}" == "true" ]]; then
   git add scripts/code_snippets/tests/outputs/test_*
   git commit -m "Update code snippets outputs"
   git remote set-url origin "https://x-access-token:${GH_TOKEN}@github.com/mongodb/mongodb-kubernetes.git"
-  git push origin "${branch}"
+  #git push origin "${branch}"
 else
   echo "Not pushing output files"
 fi

scripts/code_snippets/validate_snippets.py

@@ -54,10 +54,10 @@ def verify_snippets_files_are_unique():
             print()
 
     if duplicates_found:
-        print("Please rename duplicate files to ensure uniqueness across all snippet directories.")
+        print("Failure - please rename duplicate files to ensure uniqueness across all snippet directories.")
         return False
     else:
-        print("All snippet files have unique names across directories.")
+        print("OK - all snippets have unique names across directories.")
         return True
 
 

scripts/dev/contexts/e2e_mdb_community

@@ -10,3 +10,12 @@ source "${script_dir}/variables/mongodb_latest"
 
 # This variable is needed otherwise the `fetch_om_information.sh` script is called and fails the test
 export OM_EXTERNALLY_CONFIGURED="true"
+
+# Temporary development images built from mongot master
+#export MDB_SEARCH_COMMUNITY_VERSION="776d43523d185b6b234289e17c191712a3e6569b" # master
+#export MDB_SEARCH_COMMUNITY_VERSION="d6884ae132aab30497af55dbaff05e8274e9775f" # Local->Admin
+#export MDB_SEARCH_COMMUNITY_VERSION="ad8acf5c3a045d6e0306ad67d61fcb5be40f57ae" # hardcoded mdbc-rs replicaset name
+#export MDB_SEARCH_COMMUNITY_VERSION="b9b80915f5571bfa5fc2aa70acb20d784e68d79b" # hardcoded Local->Admin, handled replicaSetName in config
+export MDB_SEARCH_COMMUNITY_VERSION="fbd60fb055dd500058edcb45677ea85d19421f47" # Nolan's fixes
+export MDB_SEARCH_COMMUNITY_NAME="mongot/community"
+export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"

scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa

@@ -16,3 +16,7 @@ export CUSTOM_OM_VERSION
 
 export CUSTOM_MDB_VERSION=6.0.5
 export CUSTOM_MDB_PREV_VERSION=5.0.7
+
+export MDB_SEARCH_COMMUNITY_VERSION="fbd60fb055dd500058edcb45677ea85d19421f47" # Nolan's fixes
+export MDB_SEARCH_COMMUNITY_NAME="mongot/community"
+export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"

scripts/dev/contexts/e2e_static_mdb_kind_ubi_cloudqa

@@ -17,3 +17,7 @@ export CUSTOM_OM_VERSION
 
 export CUSTOM_MDB_PREV_VERSION=6.0.16
 export CUSTOM_MDB_VERSION=7.0.5
+
+export MDB_SEARCH_COMMUNITY_VERSION="fbd60fb055dd500058edcb45677ea85d19421f47" # Nolan's fixes
+export MDB_SEARCH_COMMUNITY_NAME="mongot/community"
+export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"

scripts/dev/contexts/private_kind_code_snippets

@@ -8,6 +8,9 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
+source "${script_dir}/e2e_mdb_community"
 
 export NAMESPACE=mongodb
 export CODE_SNIPPETS_FLAVOR=e2e_private
+
+export ops_manager_version="cloud_qa"

scripts/funcs/operator_deployment

@@ -34,6 +34,9 @@ get_operator_helm_values() {
     "operator.telemetry.send.enabled=${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}"
     # lets collect and save in the configmap as frequently as we can
     "operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}"
+    "search.community.repo=${MDB_SEARCH_COMMUNITY_REPO_URL}"
+    "search.community.name=${MDB_SEARCH_COMMUNITY_NAME}"
+    "search.community.version=${MDB_SEARCH_COMMUNITY_VERSION}"
   )
 
   if [[ "${MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION:-}" != "" ]]; then