Skip to content

Commit a15b55b

Browse files
authored
Merge pull request #1 from dkwon17/add-post-release-testing
Add post release testing
2 parents 1fba11a + e6569e2 commit a15b55b

1 file changed

Lines changed: 18 additions & 12 deletions

File tree

make-release.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717

1818
set -e
19-
DWO_REPO="${DWO_REPO:-git@github.com:devfile/devworkspace-operator}"
20-
DWO_QUAY_REPO="${DWO_QUAY_REPO:-quay.io/devfile/devworkspace-controller}"
21-
PROJECT_CLONE_QUAY_REPO="${PROJECT_CLONE_QUAY_REPO:-quay.io/devfile/project-clone}"
22-
DWO_BUNDLE_QUAY_REPO="${DWO_BUNDLE_QUAY_REPO:-quay.io/devfile/devworkspace-operator-bundle}"
23-
DWO_INDEX_IMAGE="${DWO_INDEX_IMAGE:-quay.io/devfile/devworkspace-operator-index:release}"
24-
DWO_DIGEST_INDEX_IMAGE="${DWO_DIGEST_INDEX_IMAGE:-quay.io/devfile/devworkspace-operator-index:release-digest}"
19+
DWO_REPO="${DWO_REPO:-git@github.com:dkwon17/devworkspace-operator}"
20+
DWO_QUAY_REPO="${DWO_QUAY_REPO:-quay.io/dkwon17/devworkspace-controller}"
21+
PROJECT_CLONE_QUAY_REPO="${PROJECT_CLONE_QUAY_REPO:-quay.io/dkwon17/project-clone}"
22+
DWO_BUNDLE_QUAY_REPO="${DWO_BUNDLE_QUAY_REPO:-quay.io/dkwon17/devworkspace-operator-bundle}"
23+
DWO_INDEX_IMAGE="${DWO_INDEX_IMAGE:-quay.io/dkwon17/devworkspace-operator-index:release}"
24+
DWO_DIGEST_INDEX_IMAGE="${DWO_DIGEST_INDEX_IMAGE:-quay.io/devfildkwon17/devworkspace-operator-index:release-digest}"
2525
MAIN_BRANCH="main"
2626
ARCHITECTURES="linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
2727
VERBOSE=""
@@ -131,15 +131,15 @@ update_images() {
131131

132132
# Update defaults in Makefile
133133
sed -i Makefile -r \
134-
-e "s|quay.io/devfile/devworkspace-controller:[0-9a-zA-Z._-]+|${DWO_QUAY_IMG}|g" \
135-
-e "s|quay.io/devfile/project-clone:[0-9a-zA-Z._-]+|${PROJECT_CLONE_QUAY_IMG}|g" \
136-
-e "s|quay.io/devfile/devworkspace-operator-bundle:[0-9a-zA-Z._-]+|${DWO_BUNDLE_QUAY_IMG}|g" \
137-
-e "s|quay.io/devfile/devworkspace-operator-index:[0-9a-zA-Z._-]+|${DWO_INDEX_IMAGE}|g"
134+
-e "s|quay.io/dkwon17/devworkspace-controller:[0-9a-zA-Z._-]+|${DWO_QUAY_IMG}|g" \
135+
-e "s|quay.io/dkwon17/project-clone:[0-9a-zA-Z._-]+|${PROJECT_CLONE_QUAY_IMG}|g" \
136+
-e "s|quay.io/dkwon17/devworkspace-operator-bundle:[0-9a-zA-Z._-]+|${DWO_BUNDLE_QUAY_IMG}|g" \
137+
-e "s|quay.io/dkwon17/devworkspace-operator-index:[0-9a-zA-Z._-]+|${DWO_INDEX_IMAGE}|g"
138138

139139
# Update defaults in generate_deployment.sh
140140
sed -i build/scripts/generate_deployment.sh -r \
141-
-e "s|quay.io/devfile/devworkspace-controller:[0-9a-zA-Z._-]+|${DWO_QUAY_IMG}|g" \
142-
-e "s|quay.io/devfile/project-clone:[0-9a-zA-Z._-]+|${PROJECT_CLONE_QUAY_IMG}|g"
141+
-e "s|quay.io/dkwon17/devworkspace-controller:[0-9a-zA-Z._-]+|${DWO_QUAY_IMG}|g" \
142+
-e "s|quay.io/dkwon17/project-clone:[0-9a-zA-Z._-]+|${PROJECT_CLONE_QUAY_IMG}|g"
143143

144144
local DEFAULT_DWO_IMG="$DWO_QUAY_IMG"
145145
local PROJECT_CLONE_IMG="$PROJECT_CLONE_QUAY_IMG"
@@ -324,6 +324,12 @@ release() {
324324
update_images "$NEXT_VERSION_Z"
325325
git_commit_and_push "chore: release: bump to ${NEXT_VERSION_Z} in $X_BRANCH" "ci-bump-$X_BRANCH-$NEXT_VERSION_Z"
326326

327+
# Add bundle to main branch
328+
git checkout "${MAIN_BRANCH}"
329+
git checkout "${X_BRANCH}" -- olm-catalog/release/channel.yaml
330+
git checkout "${X_BRANCH}" -- olm-catalog/release/devworkspace-operator.v$VERSION.bundle.yaml
331+
git_commit_and_push "chore: Add v${VERSION} bundle to main branch" "ci-add-bundle-$VERSION"
332+
327333
echo "[INFO] Release is done"
328334
}
329335

0 commit comments

Comments
 (0)