Merge branch 'master' into lucian/disable-multi-arch

Author: lucian-tosa

.githooks/pre-commit

@@ -226,11 +226,19 @@ pre_commit() {
   run_job_in_background "python_formatting"
   run_job_in_background "check_erroneous_kubebuilder_annotations"
   run_job_in_background "validate_snippets"
-  run_job_in_background "lint_helm_chart"
 
   if wait_for_all_background_jobs; then
-    echo -e "${GREEN}pre-commit: All checks passed!${NO_COLOR}"
-    return 0
+    # lint_helm_chart must be run after all the background jobs are finished because one of the BG jobs (update_jobs)
+    # updates the helm chart. And lint_helm_chart requires the helm chart to be updated already.
+    lint_helm_chart
+
+    local lint_helm_chart_status=$?
+    if [ "$lint_helm_chart_status" -eq 0 ]; then
+      echo -e "${GREEN}pre-commit: All checks passed!${NO_COLOR}"
+      return 0
+    else
+      return 1
+    fi
   else
     return 1
   fi

scripts/evergreen/retry-evergreen.sh

@@ -33,7 +33,7 @@ if [ -z "${EVERGREEN_API_KEY}" ]; then
 fi
 
 EVERGREEN_API="https://evergreen.mongodb.com/api"
-MAX_RETRIES="${EVERGREEN_MAX_RETRIES:-3}"
+MAX_RETRIES=1
 
 # Define build variants to exclude
 # We ignore openshift because they only run one test at a time.
@@ -49,7 +49,7 @@ BUILD_IDS=($(curl -s -H "Api-User: ${EVERGREEN_USER}" -H "Api-Key: ${EVERGREEN_A
 for BUILD_ID in "${BUILD_IDS[@]}"; do
   echo "Finding failed tasks in BUILD ID: ${BUILD_ID}"
   # shellcheck disable=SC2207
-  TASK_IDS=($(curl -s -H "Api-User: ${EVERGREEN_USER}" -H "Api-Key: ${EVERGREEN_API_KEY}" ${EVERGREEN_API}/rest/v2/builds/"${BUILD_ID}"/tasks | jq ".[] | select(.status == \"failed\" and .execution <= ${MAX_RETRIES})" | jq -r '.task_id'))
+  TASK_IDS=($(curl -s -H "Api-User: ${EVERGREEN_USER}" -H "Api-Key: ${EVERGREEN_API_KEY}" ${EVERGREEN_API}/rest/v2/builds/"${BUILD_ID}"/tasks | jq ".[] | select(.status == \"failed\" and .execution < ${MAX_RETRIES})" | jq -r '.task_id'))
 
   for TASK_ID in "${TASK_IDS[@]}"; do
     echo "Retriggering TASK ID: ${TASK_ID}"