Skip to content

Commit

Permalink
Merge "versioning - update build/release receipes to support tag vX.Y.Z"
Browse files Browse the repository at this point in the history
  • Loading branch information
Microzuul CI authored and Gerrit Code Review committed Jan 8, 2024
2 parents b7c00a2 + ebcad00 commit 717d2d6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Within the CI pipelines the VERSION number is auto managed
# For an upgrade job the version number is generated to high N value
# For the publish job we use the git tag name as the version number
VERSION ?= 0.0.1
VERSION ?= v0.0.1

# Image URL to use all building/pushing image targets
BASE_REPO ?= quay.io/software-factory/sf-operator
IMG ?= $(BASE_REPO):v$(VERSION)
IMG ?= $(BASE_REPO):$(VERSION)

BUNDLE_REPO ?= $(BASE_REPO)-bundle
BUNDLE_IMG ?= $(BUNDLE_REPO):v$(VERSION)
BUNDLE_IMG ?= $(BUNDLE_REPO):$(VERSION)

CATALOG_REPO ?= $(BASE_REPO)-catalog
CATALOG_IMG ?= $(CATALOG_REPO):latest
Expand Down
4 changes: 2 additions & 2 deletions doc/developer/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ please contact us on [our matrix channel](https://matrix.to/#/#softwarefactory-p
Here are the commands to run (assuming releasing HEAD to 0.0.6 version):

```sh
git tag 0.0.6 HEAD
git push gerrit 0.0.6
git tag v0.0.13 HEAD
git push gerrit v0.0.13
```
2 changes: 1 addition & 1 deletion roles/publish-operator-quay/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

- name: "Set Tag Version"
ansible.builtin.set_fact:
tag_version: "v{{ zuul.tag }}"
tag_version: "{{ zuul.tag }}"

- name: Generate the Operator's Bundle files
community.general.make:
Expand Down
2 changes: 1 addition & 1 deletion roles/upgrade-operator/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- name: Setting Variables
ansible.builtin.set_fact:
version: "{{ gen_bundle_version.stdout }}"
version: "v{{ gen_bundle_version.stdout }}"
imagename: "localhost:5000/sf-operator:{{ gen_bundle_version.stdout }}"
bundlename: "localhost:5000/sf-operator-bundle:{{ gen_bundle_version.stdout }}"
# bundleflags must have Major.Minor.Patch format
Expand Down

0 comments on commit 717d2d6

Please sign in to comment.