diff --git a/.evergreen-functions.yml b/.evergreen-functions.yml index 67a136803..90520daa4 100644 --- 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 index 8993a6cfd..6c40cf5b0 100644 --- 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: @@ -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/config/manager/manager.yaml b/config/manager/manager.yaml index c93f3acb5..964cb8cf9 100644 --- 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 index 9e06ff566..a9996102b 100644 --- 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 index fda4f6729..a97925761 100644 --- 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 index 818737f55..460c61f17 100644 --- 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 new file mode 100644 index 000000000..bd0b34500 --- /dev/null +++ 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 index be1544ee4..fde83eb09 100644 --- 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 index a18290e91..c4e53174f 100644 --- 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/release/pipeline_migrate_agent.sh b/scripts/release/pipeline_migrate_agent.sh new file mode 100755 index 000000000..2433457bc --- /dev/null +++ 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