Fix release script to match latest requirements from community portals #1572
+34
−25
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,20 +23,21 @@ function new_release { | |
|
|
||
|
|
||
| function bump_version { | ||
| echo "Bumping Makefile operator's version ..." | ||
| sed -i -E "s/^(VERSION \?=) .*/\1 ${PULP_OPERATOR_RELEASE_VERSION}/g" Makefile | ||
|
|
||
| echo "Bumping the tag used in bundle-upgrade pipeline ..." | ||
| sed -i -E "s/(ref:) ${PULP_OPERATOR_REPLACE_VERSION}/\1 ${PULP_OPERATOR_RELEASE_VERSION}/g" .github/workflows/ci.yml | ||
|
|
||
| echo "Updating the manifests with the changes ..." | ||
| make generate manifests bundle | ||
|
|
||
| echo "Updating containerImage annotation" | ||
| CSV_FILE=manifests/pulp-operator.clusterserviceversion.yaml | ||
| sed -i "s#containerImage: quay.io/pulp/pulp-operator:devel#containerImage: quay.io/pulp/pulp-operator:v${PULP_OPERATOR_RELEASE_VERSION}#g" $CSV_FILE | ||
|
Collaborator
Author
There was a problem hiding this comment. There is no reason for CSV not to be as similar as possible between pulp-operator release, k8s community release, and openshift community release. So, this should be harmless. |
||
|
|
||
| echo "Commiting changes ..." | ||
| git commit -am "Bump version from Makefile to $PULP_OPERATOR_RELEASE_VERSION" -m "[noissue]" | ||
| } | ||
|
|
||
| function stash_files { | ||
|
|
@@ -66,9 +67,11 @@ function operatorhub { | |
|
|
||
| cp -a ${PULP_OPERATOR_SOURCE_PATH}/bundle/* ${CATALOG_DIR}/ | ||
| CSV_FILE=${CATALOG_DIR}/manifests/pulp-operator.clusterserviceversion.yaml | ||
| echo " replaces: pulp-operator.v${PULP_OPERATOR_REPLACE_VERSION}" >> $CSV_FILE | ||
|
|
||
| ANNOTATIONS_FILE=${CATALOG_DIR}/metadata/annotations.yaml | ||
| echo 'com.redhat.openshift.versions: "v4.17-v4.18"' >> $ANNOTATIONS_FILE | ||
|
Collaborator
Author
There was a problem hiding this comment. Mimicking what was done in last three releases for https://github.com/redhat-openshift-ecosystem/community-operators-prod/pulls?q=is%3Apr+pulp-operator+is%3Aclosed
Collaborator
Author
There was a problem hiding this comment. Opened #1573 to improve this situation. |
||
|
|
||
| echo "Commiting changes ..." | ||
| git add operators/pulp-operator/ | ||
| git commit -sm "operator pulp-operator ($PULP_OPERATOR_RELEASE_VERSION)" | ||
|
|
@@ -86,4 +89,4 @@ bump_version | |
| operatorhub | ||
| redhat_catalog | ||
|
|
||
| echo -e "[\e[32mOK\e[0m] All tasks finished!" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what we have been essentially doing since we went GA (1.0.0). Following YAGNI, maybe bring it back when we start doing dev builds again (like a potential 2.0 release?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeap, this is one of the things I am worried about with the current release process. In the past (and also in pulpcore and plugin repositories), we worked on a
main/-devbranch which was merged to the release version/tag. When we released 1.0.0 we kind of messed with this, and I did not have time to fix it yet.So I guess, for now, we are fine with just keep releasing from the current main branch to a tag of the releasing version.