forge/forge
9
6
Fork 3
Code Issues 77 Pull requests 1 Projects 2 Wiki Activity Actions

Automate image versioning #337

New issue
Closed
opened 2026-01-12 14:33:47 +00:00 by lenkaseg · 4 comments
lenkaseg commented 2026-01-12 14:33:47 +00:00
Member
Copy link

For now, the image build workflow is following:
push to a branch (forge-staging, forge-production, src-staging, src-production) => generates an empty commit to oci-image-definition repo, which now does not serve for much because => the version must be manually increased on oci-image-definition repo => push to oci-image-definition triggers image build (isolated only to the pipeline defined in the on-cel-expression)

The desired automated workflow would be:
push to one of the branches we build the image from => this triggers an action that does the following steps and the result is a fresh and tagged image on quay without any manual action:

The action:

  1. Gets the current forgejo upstream tag
    I'd suggest taking the forgejo version from a tag that forgejo upstream is using: git describe --tags --abbrev=0, which as an example now equals to v13.0.4 or git describe --tags which in current state of things gives v13.0.4-17-ge1a1ab4ddf (latest upstream version - number of our commits on top - git hash of the last upstream tagged commit).

  2. Modifies to our versioning
    Currently the versioning we use is for example 13.0.4-1 (forgejo upstream version - our version of it. Goes up to 13.0.4-2 and more until there is new minor release, from which we start the count from 1 again: 13.0.5-1)
    I see three options:

    2.1. We could keep it as it is, but automate it. That means make a script that gets the latest forgejo upstream version and bumps the second number +1. If the minor version increased, start from 1. This is possible, but I find it a bit cumbersome.
    2.2. We could change it to 13.0.4-5cc0f00ae3 (latest forgejo upstream - our last git commit sha). We would know immediately from which exact commit each of the builds is.
    2.3. We could use the v13.0.4-17-ge1a1ab4ddf format, the direct result of git describe --tags. The simplest option, no additional script needed, and we know exactly the latest forgejo version, latest forgejo upstream commit + the number of our commits on top. My personal favorite solution.

  3. Modifies the VERSION file in the oci-image-definition repo with that version and pushes it to oci-image-definition

  4. This starts a build of the respective image(s)

For now, the image build workflow is following: push to a branch (forge-staging, forge-production, src-staging, src-production) => generates an empty commit to oci-image-definition repo, which now does not serve for much because => the version must be manually increased on oci-image-definition repo => push to oci-image-definition triggers image build (isolated only to the pipeline defined in the [on-cel-expression](https://codeberg.org/fedora/oci-image-definitions/src/branch/main/.tekton/forgejo-oci-images-prod-stable-push.yaml#L10)) The desired automated workflow would be: push to one of the branches we build the image from => this triggers **an action** that does the following steps and the result is a fresh and tagged image on quay without any manual action: **The action**: 1. **Gets the current forgejo upstream tag** I'd suggest taking the forgejo version from a tag that forgejo upstream is using: `git describe --tags --abbrev=0`, which as an example now equals to `v13.0.4` or `git describe --tags` which in current state of things gives `v13.0.4-17-ge1a1ab4ddf` (latest upstream version - number of our commits on top - git hash of the last upstream tagged commit). 2. **Modifies to our versioning** Currently the versioning we use is for example **13.0.4-1** (forgejo upstream version - our version of it. Goes up to 13.0.4-2 and more until there is new minor release, from which we start the count from 1 again: 13.0.5-1) I see three options: 2.1. We could keep it as it is, but automate it. That means make a script that gets the latest forgejo upstream version and bumps the second number +1. If the minor version increased, start from 1. This is possible, but I find it a bit cumbersome. 2.2. We could change it to **13.0.4-5cc0f00ae3** (latest forgejo upstream - our last git commit sha). We would know immediately from which exact commit each of the builds is. 2.3. We could use the **v13.0.4-17-ge1a1ab4ddf** format, the direct result of `git describe --tags`. The simplest option, no additional script needed, and we know exactly the latest forgejo version, latest forgejo upstream commit + the number of our commits on top. My personal favorite solution. 3. **Modifies the VERSION file in the oci-image-definition repo with that version and pushes it to oci-image-definition** 4. This **starts a build** of the respective image(s)
lenkaseg added this to the Backlog project 2026-01-12 14:34:33 +00:00
lenkaseg commented 2026-01-21 11:40:08 +00:00
Author
Member
Copy link

After discussion on a team standup, it was decided to go with the option 2.2: forgejo upstream tag-our branch last commit

After discussion on a team standup, it was decided to go with the option 2.2: `forgejo upstream tag`-`our branch last commit`
lenkaseg modified the project from Backlog to Sprint 13 2026-01-26 10:20:25 +00:00
lenkaseg commented 2026-02-03 15:23:48 +00:00
Author
Member
Copy link

Related PR here: https://codeberg.org/fedora/forgejo/pulls/82

Related PR here: https://codeberg.org/fedora/forgejo/pulls/82
lenkaseg commented 2026-02-09 09:56:25 +00:00
Author
Member
Copy link

Tagging now looks like this:
quay.io/konflux-fedora/fedora-infra-tenant/forgejo-oci-images-src-staging-stable:vv14.0.2-3dcf904db1

Two things:

  1. fix the second 'v' in the forgejo upstream version
  2. in case we make another build from the same fedora/forgejo commit, but different oci-image-definition commit, the tag should reflect that. For that I see two options:

Option 1: follow "rpm packing style" adding a +1 number: v14.0.2-3dcf904db1-1, v14.0.2-3dcf904db1-2, ... Maybe cleaner, but might be difficult to see which commit the -1, -2 are build from.
Option 2: v14.0.2-3dcf904db1-2f146b5f9a, which is forgejo_upstream_tag - fedora/forgejo_last_git_sha - fedora/oci-image-definition_last_git_sha. Advantage: we know which commits exactly the image is built from. Disadvantage - might be a bit less esthetic?

Tagging now looks like this: `quay.io/konflux-fedora/fedora-infra-tenant/forgejo-oci-images-src-staging-stable:vv14.0.2-3dcf904db1` Two things: 1. fix the second 'v' in the forgejo upstream version 2. in case we make another build from the same fedora/forgejo commit, but different oci-image-definition commit, the tag should reflect that. For that I see two options: Option 1: follow "rpm packing style" adding a +1 number: v14.0.2-3dcf904db1-1, v14.0.2-3dcf904db1-2, ... Maybe cleaner, but might be difficult to see which commit the -1, -2 are build from. Option 2: v14.0.2-3dcf904db1-2f146b5f9a, which is forgejo_upstream_tag - fedora/forgejo_last_git_sha - fedora/oci-image-definition_last_git_sha. Advantage: we know which commits exactly the image is built from. Disadvantage - might be a bit less esthetic?
lenkaseg commented 2026-02-11 15:41:05 +00:00
Author
Member
Copy link

Example of a new image tag: quay.io/konflux-fedora/fedora-infra-tenant/forgejo-oci-images-src-staging-stable:v14.0.2-1de02-210cb

'v14.0.2-1de02-210cb' => latest forgejo upstream tag - fedora/forgejo last commit git sha (depends on branch, 5 char) - oci-image-definition last commit git sha (5char).

Example of a new image tag: quay.io/konflux-fedora/fedora-infra-tenant/forgejo-oci-images-src-staging-stable:v14.0.2-1de02-210cb 'v14.0.2-1de02-210cb' => latest forgejo upstream tag - [fedora/forgejo last commit git sha](https://codeberg.org/fedora/forgejo/commits/branch/main) (depends on branch, 5 char) - [oci-image-definition last commit git sha](https://github.com/fedora-infra/forgejo-oci-images/commits/main/) (5char).
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
test
docs
No results found.
Labels
Clear labels   
Backlog Status
Needs Review
Work items that have been created or updated but need review, refinement, or approval before they can be considered ready for sprint planning.

  
Backlog Status
Ready
Work items that have been reviewed, refined, and are ready to be committed to a sprint. These items have clear requirements and could be worked on immediately when capacity is available.

  
Chore

Tasks that are necessary but don't directly deliver new value to the end-user. These are internal tasks like updating a library, managing user accounts, or setting up a new service.

  
points
01
A task that is simple, small, and has very little uncertainty. It should be easy enough for any team member to pick up and complete quickly, without a lot of discussion or research.

  
points
02
This is a task that is slightly more complex or larger than a "1." It might involve two or three simple steps, but the outcome is still very clear and there's little uncertainty.

  
points
03
medium-sized task with some noticeable complexity. It might require a bit more thought or collaboration. The steps are well-defined, but it's not a trivial change.

  
points
05
a significant piece of work. It has more complexity and a higher degree of uncertainty than smaller tasks. It might require some research, a design discussion, or collaboration across multiple teams.

  
points
08
complex task with a lot of uncertainty. It's often the largest size that a team will consider for a single sprint. It likely requires a detailed breakdown and multiple team members to complete.

  
points
13
Any task that feels like it's a "13" or more is considered an Epic. These are too large and uncertain to be worked on in a single sprint.

  
Priority
High
This is for work that is critical and needs to be addressed in the next sprint. It's often for urgent bugs, important features, or a major piece of technical debt that is blocking other work.

  
Priority
Low
This is for work that is good to do but not urgent. It's a candidate for being worked on when there's extra time or when it rises in importance. It can stay in the backlog for a longer period.

  
Priority
Medium
This is for important work that should be done soon, but isn't as urgent as a high-priority item. It will likely be considered for the next 1-2 sprints.

  
Sprint Status
Blocked
Indicates the work cannot proceed. There is a dependency or an issue that is preventing the team from completing the task. This is a flag for the Scrum Master to help unblock the team.

  
Sprint Status
Done
Work items that have been completed, reviewed, and integrated. No further work is needed within the current sprint.

  
Sprint Status
In Progress
This label is for work that a developer is actively working on. This is usually what you'll see on the "In Progress" column of your project board.

  
Sprint Status
Review
This indicates that the work is complete, but it is now in a review state. This could mean a peer code review, a QA check, or a review by the Product Owner.

  
Sprint Status
To Do
Work items that are committed to the sprint but haven't been started yet. These items are ready to be picked up by team members.

  
Technical Debt

work that improves the codebase without adding new features. It's work that pays down the "debt" you've accumulated, such as refactoring a messy piece of code, improving test coverage.

  
Work Item
Bug
Issues where the system is not working as intended or designed. Bugs represent deviations from expected behavior.

  
Work Item
Epic

  
Work Item
Spike

  
Work Item
Task

  
Work Item
User Story

  
Backlog Status
Needs Review
Work items that have been created or updated but need review, refinement, or approval before they can be considered ready for sprint planning.

  
Backlog Status
Ready
Work items that have been reviewed, refined, and are ready to be committed to a sprint. These items have clear requirements and can be worked on immediately when capacity is available.

  
chore

Work that needs to be done but doesn't add new functionality or fix bugs. Maintenance tasks that keep the system running smoothly and the codebase clean.

  
documentation

Work focused on creating, updating, or improving documentation for users, developers, or system administrators.

  
points
01
A task that is simple, small, and has very little uncertainty. It should be easy enough for any team member to pick up and complete quickly, without a lot of discussion or research.

  
points
02
This is a task that is slightly more complex or larger than a "1." It might involve two or three simple steps, but the outcome is still very clear and there's little uncertainty.

  
points
03
Medium-sized task with some noticeable complexity. It might require a bit more thought or collaboration. The steps are well-defined, but it's not a trivial change.

  
points
05
A significant piece of work. It has more complexity and a higher degree of uncertainty than smaller tasks. It might require some research, a design discussion, or collaboration across multiple teams.

  
points
08
Complex task with a lot of uncertainty. It's often the largest size that a team will consider for a single sprint. It likely requires a detailed breakdown and multiple team members to complete.

  
points
13
Any task that feels like it's a "13" or more is considered an Epic. These are too large and uncertain to be worked on in a single sprint and should be broken down.

  
Priority
High
This is for work that is critical and needs to be addressed in the next sprint. It's often for urgent bugs, important features, or a major piece of technical debt that is blocking other work.

  
Priority
Low
This is for work that is good to do but not urgent. It's a candidate for being worked on when there's extra time or when it rises in importance. It can stay in the backlog for a longer period.

  
Priority
Medium
This is for important work that should be done soon, but isn't as urgent as a high-priority item. It will likely be considered for the next 1-2 sprints.

  
Sprint Status
Blocked
Work items that cannot progress due to external dependencies, blockers, or issues that need resolution.

  
Sprint Status
Done
Work items that have been completed, reviewed, and integrated. No further work is needed within the current sprint.

  
Sprint Status
In Progress
Work items currently being worked on by a team member. Active development, research, or implementation is happening.

  
Sprint Status
Review
Work items that are complete but need review, testing, or approval before being marked as done.

  
Sprint Status
To Do
Work items that are committed to the sprint but haven't been started yet. These items are ready to be picked up by team members.

  
Technical Debt

Work that addresses shortcuts, workarounds, or suboptimal implementations that were done previously to meet deadlines. These items improve code quality, maintainability, or performance without adding new features.

  
Work Item
Bug
Issues where the system is not working as intended or designed. Bugs represent deviations from expected behavior.

  
Work Item
Epic
Large initiatives that are broken down into multiple smaller work items (user stories, tasks, bugs). Epics represent significant features or projects that span multiple sprints.

  
Work Item
Spike
Time-boxed research, investigation, or proof-of-concept work to reduce uncertainty or explore solutions. Spikes help inform future development decisions.

  
Work Item
Task
Used to break down larger user stories into smaller, manageable implementation pieces. They focus on the specific technical steps needed to deliver the user story's value.

  
Work Item
User Story
User-facing features or functionality that can be framed from a user perspective, describing what someone wants to accomplish and why.

No labels
Backlog Status
Needs Review
Backlog Status
Ready
Chore
points
01
points
02
points
03
points
05
points
08
points
13
Priority
High
Priority
Low
Priority
Medium
Sprint Status
Blocked
Sprint Status
Done
Sprint Status
In Progress
Sprint Status
Review
Sprint Status
To Do
Technical Debt
Work Item
Bug
Work Item
Epic
Work Item
Spike
Work Item
Task
Work Item
User Story
Backlog Status
Needs Review
Backlog Status
Ready
chore
documentation
points
01
points
02
points
03
points
05
points
08
points
13
Priority
High
Priority
Low
Priority
Medium
Sprint Status
Blocked
Sprint Status
Done
Sprint Status
In Progress
Sprint Status
Review
Sprint Status
To Do
Technical Debt
Work Item
Bug
Work Item
Epic
Work Item
Spike
Work Item
Task
Work Item
User Story
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Sprint 14
Assignees
Clear assignees
No assignees
lenkaseg
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
forge/forge#337
No description provided.