Skip to content

Commit a7fde93

Browse files
authored
pre-23.7-release changes (#47)
1 parent ae3d165 commit a7fde93

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

release/README.adoc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ To create release branches use the `create-release-branch.sh` script, called fro
5656
----
5757

5858
- `-b <release>`: the release number (mandatory). This must be a semver-compatible value (i.e. without leading zeros) such as `23.1`, `23.10` etc. and will be used to create a branch with the name `release-<release>` e.g. `release-23.1`
59-
- `-p`: push flag (optional, default is "false"). If provided, the created branches plus any changes made as part fo this process will be pushed to the origin.
59+
- `-p`: push flag (optional, default is "false"). If provided, the created branches plus any changes made as part of this process will be pushed to the origin.
6060
- `-c`: cleanup flag (optional, default is "false"). If provided, the repository folders will be torn down on completion.
6161
- `-w`: where to create the branch. It can be "products", "operators", "both".
6262
@@ -141,11 +141,6 @@ Some post release steps are performed with `release/post-release.sh` script, cal
141141
- `-t <release-tag>`: the release tag (mandatory). This must be a semver-compatible value (i.e. major/minor/path, without leading zeros) such as `23.1.0`, `23.10.3` etc. and will be used to create a tag with the name
142142
- `-p`: push flag (optional, default is "false"). If provided, the created commits and tags made as part of this process will be pushed to the origin.
143143
144-
[source]
145-
----
146-
./release/create-release-tag.sh -t 23.1.0 -p -c
147-
----
148-
149144
#### What this script does
150145

151146
* checks that the release tag exists and that the all operator repositories have a clean working copy
@@ -206,7 +201,7 @@ To create release tags for bugfix/patch releases use the `create-bugfix-tag.sh`
206201

207202
[source]
208203
----
209-
./release/create-bugfix-tag.sh -t <release-tag> [-p] [-c] [-w products|operators|both]
204+
./release/create-bugfix-tag.sh -t <release-tag> [-p] [-c] [-w products|operators|both] [-i]
210205
----
211206

212207
- `-t <release-tag>`: the release tag (mandatory). This must be a semver-compatible value (i.e. major/minor/path, without leading zeros) such as `23.1.0`, `23.10.3` etc. and will be used to create a tag with the name

release/create-bugfix-tag.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ update_code() {
126126
if $PRODUCT_IMAGE_TAGS; then
127127
echo "Updating relase tag in code..."
128128
if [ -f "$TEMP_RELEASE_FOLDER/$1/tests/test-definition.yaml" ]; then
129-
# e.g. 2.2.4-stackable0.5.0 -> 2.2.4-stackable23.1
129+
# e.g. 2.2.4-stackable23.1 -> 2.2.4-stackable23.1.1, since the release tag will use major.minor only
130130
sed -i "s/-stackable.*/-stackable${RELEASE_TAG}/" "$TEMP_RELEASE_FOLDER/$1/tests/test-definition.yaml"
131131
fi
132132
else

release/create-release-branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ main() {
109109
# check if tag argument provided
110110
#-----------------------------------------------------------
111111
if [ -z "${RELEASE}" ]; then
112-
echo "Usage: create-release-branch.sh <tag>"
112+
echo "Usage: create-release-branch.sh -b <branch> [-p] [-c] [-w both|products|operators]"
113113
exit 1
114114
fi
115115
#-----------------------------------------------------------

release/create-release-tag.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ update_code() {
133133
# Not all operators have a getting started guide
134134
# that's why we verify if templating_vars.yaml exists.
135135
if [ -f "$1/docs/templating_vars.yaml" ]; then
136-
yq -i "(.versions.[] | select(. == \"*dev\")) |= \"${RELEASE_TAG}\"" "$1/docs/templating_vars.yaml"
136+
yq -i "(.versions.[] | select(. == \"*dev\")) |= \"${RELEASE}\"" "$1/docs/templating_vars.yaml"
137137
yq -i ".helm.repo_name |= sub(\"stackable-dev\", \"stackable-stable\")" "$1/docs/templating_vars.yaml"
138138
yq -i ".helm.repo_url |= sub(\"helm-dev\", \"helm-stable\")" "$1/docs/templating_vars.yaml"
139139
fi
@@ -144,7 +144,7 @@ update_code() {
144144
#--------------------------------------------------------------------------
145145
if [ -d "$1/docs/modules/getting_started/examples/code" ]; then
146146
for file in $(find "$1/docs/modules/getting_started/examples/code" -name "*.yaml"); do
147-
yq -i "(.spec | select(has(\"image\")).image | (select(has(\"stackableVersion\")).stackableVersion)) = \"${RELEASE_TAG}\"" "$file"
147+
yq -i "(.spec | select(has(\"image\")).image | (select(has(\"stackableVersion\")).stackableVersion)) = \"${RELEASE}\"" "$file"
148148
done
149149
fi
150150

@@ -155,7 +155,7 @@ update_code() {
155155
# TODO old product images won't be tested any longer
156156
if [ -f "$1/tests/test-definition.yaml" ]; then
157157
# e.g. 2.2.4-stackable0.5.0 -> 2.2.4-stackable23.1
158-
sed -i "s/-stackable.*/-stackable${RELEASE_TAG}/" "$1/tests/test-definition.yaml"
158+
sed -i "s/-stackable.*/-stackable${RELEASE}/" "$1/tests/test-definition.yaml"
159159
fi
160160

161161
#--------------------------------------------------------------------------
@@ -234,7 +234,7 @@ main() {
234234
# check if tag argument provided
235235
#-----------------------------------------------------------
236236
if [ -z "${RELEASE_TAG}" ]; then
237-
echo "Usage: create-release-tag.sh -t <tag>"
237+
echo "Usage: create-release-tag.sh -t <tag> [-p] [-c] [-w both|products|operators]"
238238
exit 1
239239
fi
240240
#-----------------------------------------------------------

0 commit comments

Comments
 (0)