Skip to content

Commit 44307ae

Browse files
committed
Fix release tasks
1 parent 8252467 commit 44307ae

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.evergreen-functions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ functions:
844844
- workdir
845845
- triggered_by_git_tag
846846
- OPERATOR_VERSION
847+
- STAGING_VERSION_OVERRIDE
847848
env:
848849
MACOS_NOTARY_KEY: ${macos_notary_keyid}
849850
MACOS_NOTARY_SECRET: ${macos_notary_secret}

.evergreen-release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ buildvariants:
211211
run_on:
212212
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
213213
allowed_requesters: [ "patch", "github_tag" ]
214+
depends_on:
215+
- name: release_kubectl_mongodb_plugin
216+
variant: release_kubectl_mongodb_plugin
214217
tasks:
215218
- name: build_test_image
216219

@@ -222,6 +225,9 @@ buildvariants:
222225
- release-rhel9-power-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
223226
- release-rhel9-power-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
224227
allowed_requesters: [ "patch", "github_tag" ]
228+
depends_on:
229+
- name: release_kubectl_mongodb_plugin
230+
variant: release_kubectl_mongodb_plugin
225231
tasks:
226232
- name: build_test_image_ibm_power
227233

@@ -236,6 +242,9 @@ buildvariants:
236242
- release-rhel9-zseries-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
237243
- release-rhel9-zseries-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
238244
allowed_requesters: [ "patch", "github_tag" ]
245+
depends_on:
246+
- name: release_kubectl_mongodb_plugin
247+
variant: release_kubectl_mongodb_plugin
239248
tasks:
240249
- name: build_test_image_ibm_z
241250

scripts/release/kubectl_mongodb/promote_kubectl_plugin.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ def main():
3939

4040
kubectl_plugin_staging_info = load_build_info(BuildScenario.STAGING).binaries[KUBECTL_PLUGIN_BINARY]
4141
staging_scenario_bucket_name = kubectl_plugin_staging_info.s3_store
42-
staging_version = get_commit_from_tag(release_version)
42+
staging_version_override = os.environ.get("STAGING_VERSION_OVERRIDE")
43+
if staging_version_override:
44+
staging_version = staging_version_override
45+
else:
46+
staging_version = get_commit_from_tag(release_version)
4347

4448
artifacts_dict = download_artifacts_from_s3(
4549
release_version, release_platforms, staging_version, staging_scenario_bucket_name

0 commit comments

Comments
 (0)