Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove tag_version from kiwi #1973

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove tag_version from kiwi #1973

wants to merge 3 commits into from

Conversation

dcermak
Copy link
Collaborator

@dcermak dcermak commented Nov 8, 2024

Setting a tag version results in the kiwi #!BuildVersion magic entry not including the patch version, which prevents publishing to the registry as no version sorts higher than the existing entries

@dcermak
Remove tag_version from kiwi
72bf06b 
Setting a tag version results in the kiwi #!BuildVersion magic entry not
including the patch version, which prevents publishing to the registry as no
version sorts higher than the existing entries
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
c57b5c6
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
bdccc50
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
e6846cc
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
2b824b5
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2024 •
edited
Loading

Created a staging project on OBS for 6: home:defolos:BCI:Staging:SLE-15-SP6:6-1973
Changes pushed to branch 6-1973 as commit d0d6a1a65596c3ddd2cd4d48b93eb7034b8798d5
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP6:6-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=15.6 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1973/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1973/containerfile/bci/kiwi:latest

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2024 •
edited
Loading

Created a staging project on OBS for 7: home:defolos:BCI:Staging:SLE-15-SP7:7-1973
Changes pushed to branch 7-1973 as commit 0f06bb676100b25762eb5ef5af95d3faf40eb7c3
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=15.7 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1973/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1973/containerfile/bci/kiwi:9

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2024 •
edited
Loading

Created a staging project on OBS for Tumbleweed: home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1973
Changes pushed to branch Tumbleweed-1973 as commit 82be771fce0e031827f74be4d6ab6b67eca01ded
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=tumbleweed TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1973/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1973/containerfile/opensuse/bci/kiwi:latest

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2024 •
edited
Loading

Created a staging project on OBS for 16.0: home:defolos:BCI:Staging:16.0:16.0-1973
Changes pushed to branch 16.0-1973 as commit 73649fa2f0801267adaf6ca7e675b3da624f2191
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:16.0:16.0-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-1973 for x86_64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-1973 for aarch64: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-1973 for s390x: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-1973 for ppc64le: current state: published
Build results:

package name status build log
kiwi-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=16.0 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-1973/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-1973/containerfile/bci/kiwi:10

@msmeissn
Copy link
Contributor

msmeissn commented Nov 8, 2024

package was:
bci-kiwi-9.24-15.6.9.24
and is now:
bci-kiwi-9.24.43-15.6.9.24.43

so the release part is OK, but the main part should probably still be 9.24

@dcermak
[kiwi] Indent package list for readability
e4402d4
@dcermak
Create /etc/kiwi.yml for kiwi >= 10.0
3f3ad2d 
Kiwi 10 switched to use partx, which requires udev to operate. As we don't have
udev in the container, we create a custom config file that forces the usage of
kpartx
dirkmueller
dirkmueller requested changes Nov 8, 2024
View reviewed changes
Copy link
Member

@dirkmueller dirkmueller left a comment

Choose a reason for hiding this comment

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

this drops the tag-version which we need for stable filenames for aggregation.

dirkmueller
dirkmueller reviewed Nov 8, 2024
View reviewed changes
src/bci_build/package/kiwi.py
get_pkg_version("python-kiwi", os_version), ParseVersion.PATCH
)
kiwi_major = format_version(kiwi_ver, ParseVersion.MAJOR)
use_kpartx = int(kiwi_major) >= 10
Copy link
Member

Choose a reason for hiding this comment

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

you can do that with the kiwi_minor below as well, and if you avoid the extra "use_kpartx" environment variable (which is weirdly named because it is always using kpartx), you can avoid the whole rewrite to a for loop..

Copy link
Member

Choose a reason for hiding this comment

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

I made #1974 for this. breaking this out of the tag_version mess..

dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
73649fa
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
d0d6a1a
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
0f06bb6
dcermak pushed a commit that referenced this pull request Nov 8, 2024
Test build for #1973
82be771
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dirkmueller dirkmueller dirkmueller requested changes

@msmeissn msmeissn Awaiting requested review from msmeissn

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dcermak @msmeissn @dirkmueller