Merge branch 'master' into fix-patch-run-ccloudqa

nammn · web-flow · commit 64a1f9ca774a · 2025-08-26T19:10:07.000+02:00
diff --git a/.evergreen-functions.yml b/.evergreen-functions.yml
@@ -541,6 +541,17 @@ functions:
           - ${workdir}/bin
         binary: scripts/evergreen/e2e/build_tests_image_ibm.sh
 
+  pipeline_migrate_agents:
+    - *switch_context
+    - command: subprocess.exec
+      retry_on_failure: false
+      type: setup
+      params:
+        shell: bash
+        <<: *e2e_include_expansions_in_env
+        working_dir: src/github.com/mongodb/mongodb-kubernetes
+        binary: scripts/release/pipeline_migrate_agent.sh
+
   pipeline:
     - *switch_context
     - command: subprocess.exec
diff --git a/.evergreen.yml b/.evergreen.yml
@@ -356,6 +356,15 @@ tasks:
           image_name: agent
           build_scenario: --build-scenario manual_release
 
+  - name: migrate_all_agents
+    # this enables us to run this variant manually to build all the agents for the new registry
+    allowed_requesters: [ "patch" ]
+    commands:
+      - func: clone
+      - func: setup_building_host
+      - func: quay_login
+      - func: pipeline_migrate_agents
+
   - name: run_precommit_and_push
     tags: ["patch-run"]
     commands:
@@ -1375,7 +1384,7 @@ buildvariants:
     display_name: e2e_om60_kind_ubi
     tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium-high-memory
     <<: *base_om6_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -1387,7 +1396,7 @@ buildvariants:
     display_name: e2e_static_om60_kind_ubi
     tags: [ "e2e_test_suite", "static" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium
     <<: *base_om6_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1397,7 +1406,7 @@ buildvariants:
     display_name: e2e_om70_kind_ubi
     tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium-high-memory
     <<: *base_om7_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -1420,7 +1429,7 @@ buildvariants:
     display_name: e2e_om80_kind_ubi
     tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium-high-memory
     <<: *base_om8_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -2097,3 +2106,11 @@ buildvariants:
     tasks:
       - name: publish_ops_manager
       - name: release_agent
+
+  - name: migrate_all_agents
+    display_name: migrate_all_agents
+    allowed_requesters: [ "patch" ]
+    run_on:
+      - ubuntu2204-large
+    tasks:
+      - name: migrate_all_agents
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -202,7 +202,7 @@ wait_for_all_background_jobs() {
       for failure in "${failures[@]}"; do
         echo -e "$failure"
       done
-      echo -e "${RED}To see the details look for the job's logs by it's prefixed name (e.g. \"shellcheck:\").${NO_COLOR}"
+      echo -e "${RED}To see the details look/filter for the job's logs by it's prefixed name (e.g. \"start_shellcheck:\", \"lint_code:\", \"shellcheck failed\").${NO_COLOR}"
       return 1
     fi
 
@@ -229,10 +229,17 @@ pre_commit() {
 # Function to run shellcheck on a single file
 run_shellcheck() {
   local file="$1"
-  echo "Running shellcheck on $file"
-  if ! shellcheck --color=always -x "$file" -e SC2154 -e SC1091 -e SC1090 -e SC2148 -o require-variable-braces -P "scripts"; then
+
+  local diff_output
+  diff_output=$(shellcheck -f diff "$file" -e SC2154 -e SC1091 -e SC1090 -e SC2148 -o require-variable-braces -P "scripts" 2>&1)
+
+  if [[ -n "$diff_output" && "$diff_output" != *"Issues were detected, but none were auto-fixable"* ]]; then
+    echo "$diff_output" | git apply
+    echo "Applied auto-fixes for $file"
+  elif [[ "$diff_output" == *"Issues were detected, but none were auto-fixable"* ]]; then
     echo -e "${RED}shellcheck failed on $file${NO_COLOR}"
-    exit 1
+    shellcheck --color=always -x "$file" -e SC2154 -e SC1091 -e SC1090 -e SC2148 -o require-variable-braces -P "scripts"
+    return 1
   fi
 }
 
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -130,8 +130,6 @@ spec:
               value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0"
             - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
               value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml
@@ -99,7 +99,6 @@ relatedImages:
   - 8.0.0-ubi8
   - 8.0.0-ubi9
   agent:
-  - 107.0.11.8645-1
   - 107.0.12.8669-1
   - 107.0.13.8702-1
   - 107.0.15.8741-1
diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml
@@ -434,8 +434,6 @@ spec:
               value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0"
             - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
               value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
               value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
diff --git a/release.json b/release.json
@@ -117,10 +117,6 @@
             "agent_version": "12.0.35.7911-1",
             "tools_version": "100.10.0"
           },
-          "7.0.11": {
-            "agent_version": "107.0.11.8645-1",
-            "tools_version": "100.10.0"
-          },
           "7.0.12": {
             "agent_version": "107.0.12.8669-1",
             "tools_version": "100.10.0"
diff --git a/scripts/dev/contexts/migrate_all_agents b/scripts/dev/contexts/migrate_all_agents
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -Eeou pipefail
+
+script_name=$(readlink -f "${BASH_SOURCE[0]}")
+script_dir=$(dirname "${script_name}")
+
+source "${script_dir}/root-context"
+
+export preflight_submit=true
diff --git a/scripts/dev/contexts/variables/om60 b/scripts/dev/contexts/variables/om60
@@ -13,7 +13,7 @@ export CUSTOM_OM_VERSION
 export CUSTOM_MDB_VERSION=6.0.21
 export CUSTOM_MDB_PREV_VERSION=5.0.7
 
-export AGENT_VERSION=12.0.33.7866-1
+export AGENT_VERSION=12.0.35.7911-1
 export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 
 export CUSTOM_APPDB_VERSION=6.0.21-ent
diff --git a/scripts/dev/contexts/variables/om70 b/scripts/dev/contexts/variables/om70
@@ -13,7 +13,7 @@ export CUSTOM_OM_VERSION
 export CUSTOM_MDB_VERSION=7.0.18
 export CUSTOM_MDB_PREV_VERSION=6.0.21
 
-export AGENT_VERSION=107.0.11.8645-1
+export AGENT_VERSION=107.0.17.8771-1
 export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 
 export CUSTOM_APPDB_VERSION=7.0.18-ent
diff --git a/scripts/dev/recreate_python_venv.sh b/scripts/dev/recreate_python_venv.sh
@@ -77,7 +77,8 @@ ensure_required_python() {
             # Install python3-venv package for Debian/Ubuntu systems if needed
             if command -v apt-get &> /dev/null; then
                 echo "Installing python3-venv package for venv support..." >&2
-                sudo apt-get update -qq && sudo apt-get install -y python3-venv || true
+                sudo apt-get update -qq || true
+                sudo apt-get install -y python3-venv || true
             fi
             return 0
         fi
diff --git a/scripts/dev/switch_context.sh b/scripts/dev/switch_context.sh
@@ -105,17 +105,17 @@ if [[ -n "${PROJECT_DIR:-}" && -x "${PROJECT_DIR}/bin/kubectl" ]]; then
     KUBECTL_CMD="${PROJECT_DIR}/bin/kubectl"
 fi
 
-if [[ "$KUBECTL_CMD" != "kubectl" ]] || which kubectl > /dev/null; then
+if [[ "${KUBECTL_CMD}" != "kubectl" ]] || which kubectl > /dev/null; then
     if [ "${CLUSTER_NAME-}" ]; then
         # The convention: the cluster name must match the name of kubectl context
         # We expect this not to be true if kubernetes cluster is still to be created (minikube/kops)
-        if ! "$KUBECTL_CMD" config use-context "${CLUSTER_NAME}"; then
+        if ! "${KUBECTL_CMD}" config use-context "${CLUSTER_NAME}"; then
             echo "Warning: failed to switch kubectl context to: ${CLUSTER_NAME}"
             echo "Does a matching Kubernetes context exist?"
         fi
 
         # Setting the default namespace for current context
-        "$KUBECTL_CMD" config set-context "$("$KUBECTL_CMD" config current-context)" "--namespace=${NAMESPACE}" &>/dev/null || true
+        "${KUBECTL_CMD}" config set-context "$("${KUBECTL_CMD}" config current-context)" "--namespace=${NAMESPACE}" &>/dev/null || true
 
         # shellcheck disable=SC2153
         echo "Current context: ${context} (kubectl context: ${CLUSTER_NAME}), namespace=${NAMESPACE}"
diff --git a/scripts/evergreen/build_multi_cluster_kubeconfig_creator.sh b/scripts/evergreen/build_multi_cluster_kubeconfig_creator.sh
@@ -33,7 +33,7 @@ chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_s390x
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_ppc64le
 chmod +x docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_arm64
 
-cp docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_${ARCH} docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator || true
+cp docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator_"${ARCH}" docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator || true
 
 mkdir -p bin || true
 cp docker/mongodb-kubernetes-tests/multi-cluster-kube-config-creator bin/kubectl-mongodb || true
diff --git a/scripts/evergreen/e2e/build_tests_image_ibm.sh b/scripts/evergreen/e2e/build_tests_image_ibm.sh
@@ -9,6 +9,6 @@ cp requirements.txt docker/mongodb-kubernetes-tests/requirements.txt
 cp -rf helm_chart docker/mongodb-kubernetes-tests/helm_chart
 
 echo "Building mongodb-kubernetes-tests image with tag: ${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)"
-cd docker/mongodb-kubernetes-tests
+cd docker/mongodb-kubernetes-tests || exit
 sudo podman buildx build --progress plain . -f Dockerfile -t "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)" --build-arg PYTHON_VERSION="${PYTHON_VERSION}"
 sudo podman push --authfile="/root/.config/containers/auth.json" "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)"
diff --git a/scripts/evergreen/setup_aws.sh b/scripts/evergreen/setup_aws.sh
@@ -58,8 +58,8 @@ install_aws_cli_pip() {
     ${pip_cmd} install --user awscli
 
     # Add ~/.local/bin to PATH if not already there (where pip --user installs)
-    if [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
-        export PATH="$HOME/.local/bin:$PATH"
+    if [[ ":${PATH}:" != *":${HOME}/.local/bin:"* ]]; then
+        export PATH="${HOME}/.local/bin:${PATH}"
         echo "Added ~/.local/bin to PATH"
     fi
 
diff --git a/scripts/evergreen/setup_kind.sh b/scripts/evergreen/setup_kind.sh
@@ -12,7 +12,7 @@ arch_suffix=$(detect_architecture)
 latest_version="v0.27.0"
 
 # Only proceed with installation if architecture is supported (amd64 or arm64)
-if [[ "$arch_suffix" == "amd64" || "$arch_suffix" == "arm64" ]]; then
+if [[ "${arch_suffix}" == "amd64" || "${arch_suffix}" == "arm64" ]]; then
   mkdir -p "${PROJECT_DIR}/bin/"
   echo "Saving kind to ${PROJECT_DIR}/bin"
   curl --retry 3 --silent -L "https://github.com/kubernetes-sigs/kind/releases/download/${latest_version}/kind-${os}-${arch_suffix}" -o kind
diff --git a/scripts/evergreen/setup_kubectl.sh b/scripts/evergreen/setup_kubectl.sh
@@ -22,7 +22,7 @@ mv kubectl "${bindir}"
 echo "Downloading helm for ${ARCH}"
 helm_archive="${tmpdir}/helm.tgz"
 helm_version="v3.17.1"
-curl -s https://get.helm.sh/helm-${helm_version}-linux-${ARCH}.tar.gz --output "${helm_archive}"
+curl -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
 
 tar xfz "${helm_archive}" -C "${tmpdir}" &> /dev/null
 mv "${tmpdir}/linux-${ARCH}/helm" "${bindir}"
diff --git a/scripts/minikube/setup_minikube.sh b/scripts/minikube/setup_minikube.sh
@@ -29,7 +29,7 @@ EOF
 }
 
 # retrieve arch variable off the shell command line
-ARCH=${1-"$(detect_architecture)"}
+ARCH="$(detect_architecture)"
 
 echo "Setting up minikube host for architecture: ${ARCH}"
 
@@ -50,7 +50,7 @@ setup_local_registry_and_custom_image() {
       registry_running=true
     fi
 
-    if ! $registry_running; then
+    if ! ${registry_running}; then
       echo "Starting local container registry on port 5000..."
 
       # Clean up any existing registry first
@@ -63,7 +63,7 @@ setup_local_registry_and_custom_image() {
 
       # Wait for registry to be ready
       echo "Waiting for registry to be ready..."
-      for i in {1..30}; do
+      for _ in {1..30}; do
         if curl -s http://localhost:5000/v2/_catalog >/dev/null 2>&1; then
           break
         fi
diff --git a/scripts/release/pipeline_migrate_agent.sh b/scripts/release/pipeline_migrate_agent.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -Eeou pipefail
+
+scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel agent \
+    --all-agents \
+    --build-scenario manual_release \
+    -r quay.io/mongodb/mongodb-agent
