Skip to content

Commit c5839ff

Browse files
authored
CLOUDP-349071 - Fix openshift bundle (#494)
# Summary Removed `preflight_omXX_images` tasks and contexts since this was already duplicated by `preflight_release_images_check_only`. Example [patch](https://spruce.mongodb.com/version/mongodb_kubernetes_12f405afd0f823091430f0be8f4ac21d87a9559c/tasks?page=0&sorts=STATUS%3AASC%3BBASE_STATUS%3ADESC&taskName=preflight). You can see ops manager is preflighted multiple times. Furthermore, the different variants om60/70/80 ran on all versions of OM (not just the specified major version). Added annotations for the supported architectured to the csv. Removed `preflight_submit` variable from contexts as it was not relevant. The `preflight_image` evg function used evg variables, not environment variables from contexts. Therefore added the `preflight_submit` expansion to `preflight_release_images_check_only`. Added preflights for new agent image. ## Proof of Work Preflights for new agents [passed](https://spruce.mongodb.com/task/mongodb_kubernetes_preflight_release_images_check_only_preflight_mongodb_agent_image_patch_12f405afd0f823091430f0be8f4ac21d87a9559c_68e384eafb44f300073fdea5_25_10_06_08_59_23/logs?execution=0) ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details
1 parent 5acea68 commit c5839ff

14 files changed

+9
-73
lines changed

.evergreen-tasks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,4 +1318,3 @@ tasks:
13181318
tags: [ "patch-run" ]
13191319
commands:
13201320
- func: "e2e_test"
1321-

.evergreen.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,8 @@ buildvariants:
17621762
tags: [ "staging" ]
17631763
run_on:
17641764
- rhel90-large
1765+
expansions:
1766+
preflight_submit: false
17651767
tasks:
17661768
- name: preflight_images_task_group
17671769

@@ -1773,14 +1775,6 @@ buildvariants:
17731775
tasks:
17741776
- name: build_om_images
17751777

1776-
- name: preflight_om60_images
1777-
display_name: preflight_om60_images
1778-
tags: [ "staging" ]
1779-
run_on:
1780-
- rhel90-large
1781-
tasks:
1782-
- name: preflight_om_image
1783-
17841778
- name: build_om70_images
17851779
display_name: build_om70_images
17861780
tags: [ "pr_patch", "staging" ]
@@ -1789,14 +1783,6 @@ buildvariants:
17891783
tasks:
17901784
- name: build_om_images
17911785

1792-
- name: preflight_om70_images
1793-
display_name: preflight_om70_images
1794-
tags: [ "staging" ]
1795-
run_on:
1796-
- rhel90-large
1797-
tasks:
1798-
- name: preflight_om_image
1799-
18001786
- name: build_om80_images
18011787
display_name: build_om80_images
18021788
tags: [ "pr_patch", "staging" ]
@@ -1805,14 +1791,6 @@ buildvariants:
18051791
tasks:
18061792
- name: build_om_images
18071793

1808-
- name: preflight_om80_images
1809-
display_name: preflight_om80_images
1810-
tags: [ "staging" ]
1811-
run_on:
1812-
- rhel90-large
1813-
tasks:
1814-
- name: preflight_om_image
1815-
18161794
# It will be called by pct while bumping the agent cloud manager image
18171795
- name: release_agent
18181796
display_name: release_agent

config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
apiVersion: operators.coreos.com/v1alpha1
22
kind: ClusterServiceVersion
33
metadata:
4+
labels:
5+
operatorframework.io/arch.amd64: supported
6+
operatorframework.io/arch.ppc64le: supported
7+
operatorframework.io/arch.s390x: supported
8+
operatorframework.io/arch.arm64: supported
9+
operatorframework.io/os.linux: supported
410
annotations:
511
alm-examples: '[]'
612
capabilities: Deep Insights

scripts/dev/contexts/migrate_all_agents

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
66
script_dir=$(dirname "${script_name}")
77

88
source "${script_dir}/root-context"
9-
10-
export preflight_submit=true

scripts/dev/contexts/preflight_om60_images

Lines changed: 0 additions & 11 deletions
This file was deleted.

scripts/dev/contexts/preflight_om70_images

Lines changed: 0 additions & 11 deletions
This file was deleted.

scripts/dev/contexts/preflight_om80_images

Lines changed: 0 additions & 11 deletions
This file was deleted.

scripts/dev/contexts/preflight_release_images

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
66
script_dir=$(dirname "${script_name}")
77

88
source "${script_dir}/root-context"
9-
10-
export preflight_submit=true

scripts/dev/contexts/preflight_release_images_check renamed to scripts/dev/contexts/preflight_release_images_check_only

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
66
script_dir=$(dirname "${script_name}")
77

88
source "${script_dir}/root-context"
9-
10-
export preflight_submit=false

scripts/dev/contexts/publish_om60_images

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ script_dir=$(dirname "${script_name}")
77

88
source "${script_dir}/root-context"
99
source "${script_dir}/variables/om60_image"
10-
11-
export preflight_submit=true

0 commit comments

Comments
 (0)