Skip to content

Commit ac36959

Browse files
committed
Skip checking for old MCK releases (#74)
# Summary When creating the bundles for e2e tests with OLM we assume there's a previous MCK version already released in the certified registry. ## Proof of Work Passing patch: https://spruce.mongodb.com/version/6814cdc4059917000762dfb3/tasks?sorts=STATUS%3AASC%3BBASE_STATUS%3ADESC ## 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? - [ ] Have you checked for release_note changes? ## Reminder (Please remove this when merging) - Please try to Approve or Reject Changes the PR, keep PRs in review as short as possible - Our Short Guide for PRs: [Link](https://docs.google.com/document/d/1T93KUtdvONq43vfTfUt8l92uo4e4SEEvFbIEKOxGr44/edit?tab=t.0) - Remember the following Communication Standards - use comment prefixes for clarity: * **blocking**: Must be addressed before approval. * **follow-up**: Can be addressed in a later PR or ticket. * **q**: Clarifying question. * **nit**: Non-blocking suggestions. * **note**: Side-note, non-actionable. Example: Praise * --> no prefix is considered a question
1 parent cdd9b38 commit ac36959

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

scripts/evergreen/operator-sdk/prepare-openshift-bundles-for-e2e.sh

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source scripts/funcs/printing
2626
source scripts/dev/set_env_context.sh
2727

2828
increment_version() {
29-
IFS=. read -r major minor patch <<< "$1"
29+
IFS=. read -r major minor patch <<<"$1"
3030
((patch++))
3131
echo "${major}.${minor}.${patch}"
3232
}
@@ -42,7 +42,7 @@ fi
4242
generate_helm_charts() {
4343
read -ra helm_values < <(get_operator_helm_values)
4444
echo "Passing overrides to helm values: "
45-
tr ' ' '\n' <<< "${helm_values[*]}"
45+
tr ' ' '\n' <<<"${helm_values[*]}"
4646

4747
declare -a helm_set_values=()
4848
for param in "${helm_values[@]}"; do
@@ -118,23 +118,23 @@ function generate_mck_catalog_metadata() {
118118
opm init "${mck_package_name}" \
119119
--default-channel="${default_channel}" \
120120
--output=yaml \
121-
> "${catalog_yaml}"
121+
>"${catalog_yaml}"
122122

123123
echo "Adding current unreleased ${current_bundle_image} to the catalog"
124-
opm render "${current_bundle_image}" --output=yaml >> "${catalog_yaml}"
124+
opm render "${current_bundle_image}" --output=yaml >>"${catalog_yaml}"
125125

126126
# TODO: CLOUDP-310820 - After 1.0.0 release we need to clean this up: always run it.
127127
if [[ -n "${latest_bundle_version}" ]]; then
128128
echo "Adding latest release ${latest_bundle_image} to the catalog"
129-
opm render "${latest_bundle_image}" --output=yaml >> "${catalog_yaml}"
129+
opm render "${latest_bundle_image}" --output=yaml >>"${catalog_yaml}"
130130

131131
echo "Adding latest MCK release into STABLE channel to ${catalog_yaml}"
132132
echo "---
133133
schema: olm.channel
134134
package: ${mck_package_name}
135135
name: stable
136136
entries:
137-
- name: ${mck_package_name}.v${latest_bundle_version}" >> "${catalog_yaml}"
137+
- name: ${mck_package_name}.v${latest_bundle_version}" >>"${catalog_yaml}"
138138

139139
echo "Adding current MCK version replacing the latest MCK version into FAST channel to ${catalog_yaml}"
140140
echo "---
@@ -143,7 +143,7 @@ package: ${mck_package_name}
143143
name: fast
144144
entries:
145145
- name: ${mck_package_name}.v${current_bundle_version}
146-
replaces: ${mck_package_name}.v${latest_bundle_version}" >> "${catalog_yaml}"
146+
replaces: ${mck_package_name}.v${latest_bundle_version}" >>"${catalog_yaml}"
147147
else
148148
echo "Skipping addition of latest MCK release as we haven't published MCK 1.0.0 yet"
149149
fi
@@ -155,7 +155,7 @@ package: ${mck_package_name}
155155
name: migration
156156
entries:
157157
- name: ${mck_package_name}.v${current_bundle_version}
158-
replaces: ${meko_package_name}.v${meko_latest_bundle_version}" >> "${catalog_yaml}"
158+
replaces: ${meko_package_name}.v${meko_latest_bundle_version}" >>"${catalog_yaml}"
159159
}
160160

161161
function generate_meko_catalog_metadata() {
@@ -172,18 +172,18 @@ function generate_meko_catalog_metadata() {
172172
opm init "${meko_package_name}" \
173173
--default-channel="stable" \
174174
--output=yaml \
175-
> "${catalog_yaml}"
175+
>"${catalog_yaml}"
176176

177177
echo "Adding latest release ${latest_bundle_image} to the catalog"
178-
opm render "${latest_bundle_image}" --output=yaml >> "${catalog_yaml}"
178+
opm render "${latest_bundle_image}" --output=yaml >>"${catalog_yaml}"
179179

180180
echo "Adding latest MEKO release into STABLE channel to ${catalog_yaml}"
181181
echo "---
182182
schema: olm.channel
183183
package: ${meko_package_name}
184184
name: stable
185185
entries:
186-
- name: ${meko_package_name}.v${latest_bundle_version}" >> "${catalog_yaml}"
186+
- name: ${meko_package_name}.v${latest_bundle_version}" >>"${catalog_yaml}"
187187
}
188188

189189
function build_and_publish_test_catalog() {
@@ -210,28 +210,27 @@ mck_package_name="mongodb-kubernetes"
210210
meko_package_name="mongodb-enterprise"
211211

212212
certified_operators_repo="https://github.com/redhat-openshift-ecosystem/certified-operators.git"
213-
current_operator_version_from_release_json=$(jq -r .mongodbOperator < release.json)
213+
current_operator_version_from_release_json=$(jq -r .mongodbOperator <release.json)
214214
current_incremented_operator_version_from_release_json=$(increment_version "${current_operator_version_from_release_json}")
215215
current_incremented_operator_version_from_release_json_with_version_id="${current_incremented_operator_version_from_release_json}-${VERSION_ID:-"latest"}"
216216
test_catalog_image="${base_repo_url}/mongodb-kubernetes-test-catalog:${current_incremented_operator_version_from_release_json_with_version_id}"
217217
certified_repo_cloned="$(clone_git_repo_into_temp ${certified_operators_repo})"
218218

219219
# TODO: CLOUDP-310820 - After 1.0.0 release we need to clean this up: always run it.
220-
if [[ "${current_operator_version_from_release_json}" =~ ^0\. ]]; then
221-
# Version is < 1.0.0 (0.y.z)
222-
mck_latest_released_operator_version=""
223-
echo "Skipping MCK bundle lookup as we haven't published MCK 1.0.0 yet (${current_operator_version_from_release_json} is < 1.0.0)"
224-
else
225-
# Version is >= 1.0.0
226-
mck_latest_released_operator_version="$(find_the_latest_certified_operator "${certified_repo_cloned}" "${mck_package_name}")"
227-
fi
220+
# if [[ "${current_operator_version_from_release_json}" =~ ^0\. ]]; then
221+
# Version is < 1.0.0 (0.y.z)
222+
mck_latest_released_operator_version=""
223+
echo "Skipping MCK bundle lookup as we haven't published MCK 1.0.0 yet (${current_operator_version_from_release_json} is < 1.0.0)"
224+
# else
225+
# # Version is >= 1.0.0
226+
# mck_latest_released_operator_version="$(find_the_latest_certified_operator "${certified_repo_cloned}" "${mck_package_name}")"
227+
# fi
228228
meko_latest_released_operator_version="$(find_the_latest_certified_operator "${certified_repo_cloned}" "${meko_package_name}")"
229229

230230
meko_latest_certified_bundle_image="${base_repo_url}/mongodb-enterprise-operator-certified-bundle:${meko_latest_released_operator_version}"
231231
mck_latest_certified_bundle_image="${base_repo_url}/mongodb-kubernetes-certified-bundle:${mck_latest_released_operator_version}"
232232
current_bundle_image="${base_repo_url}/mongodb-kubernetes-certified-bundle:${current_incremented_operator_version_from_release_json_with_version_id}"
233233

234-
235234
header "Configuration:"
236235
echo "certified_operators_repo: ${certified_operators_repo}"
237236
echo "certified_repo_cloned: ${certified_repo_cloned}"

0 commit comments

Comments
 (0)