Skip to content

Commit e82356d

Browse files
authored
KOGITO-9492 Update bump-version script (#178)
* Update bump-version script - `image.yaml` was not correctly updated - bundle csv use Major.minor instead of full version * update CI * Update .ci/jenkins/Jenkinsfile.promote * Update .ci/jenkins/Jenkinsfile.promote
1 parent ab7f9cb commit e82356d

File tree

5 files changed

+28
-2
lines changed

5 files changed

+28
-2
lines changed

.ci/jenkins/Jenkinsfile.deploy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pipeline {
137137

138138
// Build multiplatform from generated Dockerfile
139139
dir('target/image') {
140-
cloud.dockerBuildMultiPlatformImages(tempBuiltImageTag, getImageBuildPlatforms(), true, "Kogito Serverless Operator squashed image")
140+
cloud.dockerBuildMultiPlatformImages(tempBuiltImageTag, getImageBuildPlatforms(), true, 'Kogito Serverless Operator squashed image')
141141
}
142142
}
143143
}
@@ -162,6 +162,12 @@ pipeline {
162162
// Tag with given parameter tag
163163
pushFinalImage(getTempBuiltImageTag(), helper.getImageFullTag(env.OPERATOR_IMAGE_NAME))
164164

165+
try {
166+
pushFinalImage(getTempBuiltImageTag(), helper.getImageReducedTag(env.OPERATOR_IMAGE_NAME))
167+
} catch (err) {
168+
echo 'Reduced tag cannot be applied'
169+
}
170+
165171
// Tag with `latest` tag if asked for as parameter
166172
if (helper.isDeployLatestTag()) {
167173
pushFinalImage(getTempBuiltImageTag(), helper.getImageFullTag(env.OPERATOR_IMAGE_NAME, defaultImageParamsPrefix, 'latest'))

.ci/jenkins/Jenkinsfile.promote

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,15 @@ pipeline {
6262
// Tag with given parameter tag
6363
promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix), helper.getImageFullTag(imageName, promoteImageParamsPrefix))
6464

65+
try {
66+
promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix), helper.getImageReducedTag(imageName, promoteImageParamsPrefix))
67+
} catch (err) {
68+
echo 'Reduced tag cannot be applied'
69+
}
70+
6571
// Tag with `latest` tag if asked for as parameter
6672
if (helper.isDeployLatestTag()) {
67-
promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix, 'latest'), helper.getImageFullTag(imageName, promoteImageParamsPrefix, 'latest'))
73+
promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix), helper.getImageFullTag(imageName, promoteImageParamsPrefix, 'latest'))
6874
}
6975
}
7076
}

.ci/jenkins/scripts/helper.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ String getImageFullTag(String imageName, String paramsPrefix = defaultImageParam
229229
return fullTag
230230
}
231231

232+
String getImageReducedTag(String imageName, String paramsPrefix = defaultImageParamsPrefix, String tag = '') {
233+
return getImageFullTag(imageName, paramsPrefix, cloud.getReducedTag(tag ?: getImageTag(paramsPrefix)))
234+
}
235+
232236
String constructKey(String keyPrefix, String key) {
233237
return keyPrefix ? "${keyPrefix}_${key}" : key
234238
}

hack/bump-version.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ fi
4141

4242
echo "Set new version to ${new_version} (img_suffix = '${imageSuffix}', majorMinor = ${newMajorMinorVersion})"
4343

44+
sed -i "s|version: ${old_version}|version: ${new_version}|g" image.yaml
45+
4446
sed -i "s|^VERSION ?=.*|VERSION ?= ${new_version}|g" Makefile
4547
sed -i "s|newTag:.*|newTag: ${new_version}|g" config/manager/kustomization.yaml
4648

@@ -59,4 +61,7 @@ sed -i -r "s|OperatorVersion =.*|OperatorVersion = \"${new_version}\"|g" version
5961
make generate-all
6062
make vet
6163

64+
# Update bundle
65+
sed -i "s|${new_version}|${newMajorMinorVersion}|g" $(getBundleFile)
66+
6267
echo "Version bumped to ${new_version}"

hack/env.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515

1616
CSV_DIR="config/manifests/bases"
17+
BUNDLE_DIR="bundle/manifests"
1718

1819
getOperatorVersion() {
1920
local version=$(grep -m 1 'OperatorVersion' version/version.go | awk -F\" '{print $2}')
@@ -33,3 +34,7 @@ getOperatorImageName() {
3334
getCsvFile() {
3435
echo "${CSV_DIR}/sonataflow-operator.clusterserviceversion.yaml"
3536
}
37+
38+
getBundleFile() {
39+
echo "${BUNDLE_DIR}/sonataflow-operator.clusterserviceversion.yaml"
40+
}

0 commit comments

Comments
 (0)