From b45fa08d625158ec7737eea7aac03360b42ee6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kara=C5=9B?= Date: Tue, 13 May 2025 12:37:03 +0200 Subject: [PATCH 1/2] Remove duplicated `e2e_*_smoke_release` variants. Added `e2e_*_smoke_release` to `git_tag_aliases` --- .evergreen.yml | 36 ++++++--------------------- scripts/dev/contexts/e2e_static_smoke | 2 +- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 78e2fbf80..55ff414c4 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -216,8 +216,8 @@ patch_aliases: variant_tags: [ "release_all_agents_manually" ] task: ".*" - alias: "release" - variant_tags: [ "release" ] - task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ] + variant_tags: [ "release", "e2e_smoke_release_test_suite" ] + task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ] - alias: "smoke_test_release" variant_tags: [ "e2e_smoke_release_test_suite" ] task_tags: [ "patch-run" ] @@ -247,8 +247,8 @@ github_checks_aliases: # Triggered on git tag git_tag_aliases: - git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$" - variant_tags: [ "release" ] - task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ] + variant_tags: [ "release", "e2e_smoke_release_test_suite" ] + task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ] tasks: - name: unit_tests_golang @@ -1389,9 +1389,10 @@ buildvariants: - name: e2e_smoke display_name: e2e_smoke - tags: [ "e2e_test_suite" ] + tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ] run_on: - ubuntu2204-large + allowed_requesters: [ "patch", "github_tag" ] depends_on: - name: build_test_image variant: init_test_run @@ -1400,30 +1401,7 @@ buildvariants: - name: e2e_static_smoke display_name: e2e_static_smoke - tags: [ "e2e_test_suite" ] - run_on: - - ubuntu2204-large - depends_on: - - name: build_test_image - variant: init_test_run - tasks: - - name: e2e_smoke_task_group - - - name: e2e_smoke_release - display_name: e2e_smoke_release - tags: [ "e2e_smoke_release_test_suite" ] - run_on: - - ubuntu2204-large - allowed_requesters: [ "patch", "github_tag" ] - depends_on: - - name: build_test_image - variant: init_test_run - tasks: - - name: e2e_smoke_task_group - - - name: e2e_static_smoke_release - display_name: e2e_static_smoke_release - tags: [ "e2e_smoke_release_test_suite" ] + tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ] run_on: - ubuntu2204-large allowed_requesters: [ "patch", "github_tag" ] diff --git a/scripts/dev/contexts/e2e_static_smoke b/scripts/dev/contexts/e2e_static_smoke index d7415a836..91aed5316 100644 --- a/scripts/dev/contexts/e2e_static_smoke +++ b/scripts/dev/contexts/e2e_static_smoke @@ -28,5 +28,5 @@ export INIT_OPS_MANAGER_VERSION DATABASE_VERSION="$(grep -o '"databaseImageVersion": "[^"]*' release.json | grep -o '[^"]*$')" export DATABASE_VERSION export MDB_DEFAULT_ARCHITECTURE=static -# For static smoke tests we nned the previous MDB version to have a ubi9 binary +# For static smoke tests we need the previous MDB version to have a ubi9 binary export CUSTOM_MDB_PREV_VERSION=6.0.5 From 3a6b3c2e7dcb9da890de29bdf3ae2d53227f84ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kara=C5=9B?= Date: Sun, 18 May 2025 12:46:40 +0200 Subject: [PATCH 2/2] remove release smoke tests --- scripts/dev/contexts/e2e_smoke_release | 29 ----------------- scripts/dev/contexts/e2e_static_smoke_release | 32 ------------------- 2 files changed, 61 deletions(-) delete mode 100644 scripts/dev/contexts/e2e_smoke_release delete mode 100644 scripts/dev/contexts/e2e_static_smoke_release diff --git a/scripts/dev/contexts/e2e_smoke_release b/scripts/dev/contexts/e2e_smoke_release deleted file mode 100644 index 17687d2fc..000000000 --- a/scripts/dev/contexts/e2e_smoke_release +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -Eeou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source "${script_dir}/root-context" -source "${script_dir}/variables/om70" - -export DATABASE_REGISTRY="${QUAY_REGISTRY}" -export APPDB_REGISTRY="${QUAY_REGISTRY}" -export INIT_OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" -export OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" -export OPERATOR_REGISTRY="${QUAY_REGISTRY}" -export INIT_IMAGES_REGISTRY="${QUAY_REGISTRY}" -export INIT_APPDB_REGISTRY="${QUAY_REGISTRY}" -export INIT_DATABASE_REGISTRY="${QUAY_REGISTRY}" -# Since we're sourcing this as an initial step, the jq might not be there. That's why we need bash magic here. -OPERATOR_VERSION="$(grep -o '"mongodbOperator": "[^"]*' release.json | grep -o '[^"]*$')" -export OPERATOR_VERSION -INIT_DATABASE_VERSION="$(grep -o '"initDatabaseVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_DATABASE_VERSION -INIT_APPDB_VERSION="$(grep -o '"initAppDbVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_APPDB_VERSION -INIT_OPS_MANAGER_VERSION="$(grep -o '"initOpsManagerVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_OPS_MANAGER_VERSION -DATABASE_VERSION="$(grep -o '"databaseImageVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export DATABASE_VERSION diff --git a/scripts/dev/contexts/e2e_static_smoke_release b/scripts/dev/contexts/e2e_static_smoke_release deleted file mode 100644 index 91aed5316..000000000 --- a/scripts/dev/contexts/e2e_static_smoke_release +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -set -Eeou pipefail - -script_name=$(readlink -f "${BASH_SOURCE[0]}") -script_dir=$(dirname "${script_name}") - -source "${script_dir}/root-context" -source "${script_dir}/variables/om70" - -export DATABASE_REGISTRY="${QUAY_REGISTRY}" -export APPDB_REGISTRY="${QUAY_REGISTRY}" -export INIT_OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" -export OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" -export OPERATOR_REGISTRY="${QUAY_REGISTRY}" -export INIT_IMAGES_REGISTRY="${QUAY_REGISTRY}" -export INIT_APPDB_REGISTRY="${QUAY_REGISTRY}" -export INIT_DATABASE_REGISTRY="${QUAY_REGISTRY}" -# Since we're sourcing this as an initial step, the jq might not be there. That's why we need bash magic here. -OPERATOR_VERSION="$(grep -o '"mongodbOperator": "[^"]*' release.json | grep -o '[^"]*$')" -export OPERATOR_VERSION -INIT_DATABASE_VERSION="$(grep -o '"initDatabaseVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_DATABASE_VERSION -INIT_APPDB_VERSION="$(grep -o '"initAppDbVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_APPDB_VERSION -INIT_OPS_MANAGER_VERSION="$(grep -o '"initOpsManagerVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export INIT_OPS_MANAGER_VERSION -DATABASE_VERSION="$(grep -o '"databaseImageVersion": "[^"]*' release.json | grep -o '[^"]*$')" -export DATABASE_VERSION -export MDB_DEFAULT_ARCHITECTURE=static -# For static smoke tests we need the previous MDB version to have a ubi9 binary -export CUSTOM_MDB_PREV_VERSION=6.0.5