Skip to content

Conversation

@jortel
Copy link
Contributor

@jortel jortel commented Jan 23, 2025

Fixes an issue with duplicate target labels.
Also, add support for a hub build version needed to detect upgrades.
The git tag-hash is written to /etc/hub-build. The abbreviated commit hash is appended when HEAD is a commit added to the latest label.
Examples:

v0.6.0-beta.1-1-e161635  # tag+hash
v0.6.0-beta.1-1          # tag only
e161635                  # hash only

After seeded, the build is stored in settings: .hub.db.seed.build. This is compared with current build to detect when the build has changed. Seeding is skipped when both the build (version) and the seed data have not changed.


The go.mod update was to bump go-utils for better logging of objects. Included here for better logging of the Settings.

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Jeff Ortel <[email protected]>
target.Provider = t.Provider
target.Choice = t.Choice
target.ImageID = f.ID
target.Labels = []model.TargetLabel{}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hint: This is the main fix ^.

Copy link
Member

@aufi aufi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix looks good to me, git command in container-build scripts setting hub-build probably needs some update.

83.41 git describe --match "v[0-9]*" --tags HEAD > bin/.build
83.41 fatal: No names found, cannot describe anything.

@jortel
Copy link
Contributor Author

jortel commented Jan 24, 2025

The fix looks good to me, git command in container-build scripts setting hub-build probably needs some update.

83.41 git describe --match "v[0-9]*" --tags HEAD > bin/.build
83.41 fatal: No names found, cannot describe anything.

I think it just needs --always flag.

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Jeff Ortel <[email protected]>
@jortel jortel added the cherry-pick/release-0.6 This PR should be cherry-picked to release-0.6 branch label Jan 24, 2025
Copy link
Collaborator

@mansam mansam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jortel jortel merged commit f25e7fb into konveyor:main Jan 24, 2025
14 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 24, 2025
Fixes an issue with duplicate target labels.
Also, add support for a hub build version needed to detect upgrades.
The git _tag-hash_ is written to `/etc/hub-build`. The _abbreviated_
commit hash is appended when HEAD is a commit added to the latest label.
Examples:
```
v0.6.0-beta.1-1-e161635  # tag+hash
v0.6.0-beta.1-1          # tag only
e161635                  # hash only
```

After seeded, the build is stored in settings: `.hub.db.seed.build`.
This is compared with current build to detect when the build has
changed. Seeding is _skipped_ when both the build (version) and the seed
data have not changed.

---

The go.mod update was to bump go-utils for better logging of objects.
Included here for better logging of the _Settings_.

---------

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Cherry Picker <[email protected]>
jortel added a commit that referenced this pull request Jan 24, 2025
Fixes an issue with duplicate target labels.
Also, add support for a hub build version needed to detect upgrades.
The git _tag-hash_ is written to `/etc/hub-build`. The _abbreviated_
commit hash is appended when HEAD is a commit added to the latest label.
Examples:
```
v0.6.0-beta.1-1-e161635  # tag+hash
v0.6.0-beta.1-1          # tag only
e161635                  # hash only
```

After seeded, the build is stored in settings: `.hub.db.seed.build`.
This is compared with current build to detect when the build has
changed. Seeding is _skipped_ when both the build (version) and the seed
data have not changed.

---

The go.mod update was to bump go-utils for better logging of objects.
Included here for better logging of the _Settings_.

---------

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Cherry Picker <[email protected]>

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Cherry Picker <[email protected]>
Co-authored-by: Jeff Ortel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick/release-0.6 This PR should be cherry-picked to release-0.6 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants