Skip to content

Generate the bci-base container via dockerfile generator as well#1220

Merged
dcermak merged 6 commits intomainfrom
sle15_bci_container
Jul 24, 2024
Merged

Generate the bci-base container via dockerfile generator as well#1220
dcermak merged 6 commits intomainfrom
sle15_bci_container

Conversation

@dirkmueller
Copy link
Copy Markdown
Member

@dirkmueller dirkmueller commented Jun 5, 2024

No description provided.

@dirkmueller dirkmueller marked this pull request as draft June 5, 2024 09:16
dcermak pushed a commit that referenced this pull request Jun 5, 2024
@dirkmueller
Test build for #1220
f2fd90c
dcermak pushed a commit that referenced this pull request Jun 5, 2024
@dirkmueller
Test build for #1220
48f1c54
dcermak pushed a commit that referenced this pull request Jun 5, 2024
@dirkmueller
Test build for #1220
0d983f0
dcermak pushed a commit that referenced this pull request Jun 5, 2024
@dirkmueller
Test build for #1220
7efc9d6
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 5, 2024 •
edited
Loading

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

Build Results

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package name status build log
sles15-image ⛔ excluded 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-1220/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1220/images/bci/bci-base
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1220/images/suse/sle15

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 5, 2024 •
edited
Loading

Created a staging project on OBS for 5: home:defolos:BCI:Staging:SLE-15-SP5:5-1220
Changes pushed to branch 5-1220 as commit cc651f6f541a80f0895d892335cb1b434dc4a29e
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 5, 2024 •
edited
Loading

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

Build Results

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1220 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-1220 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-1220 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-1220 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-1220/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1220/containerfile/opensuse/bci/kiwi
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️ ⚠️⚠️ Project and Branch have been deleted ⚠️⚠️

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 5, 2024 •
edited
Loading

Created a staging project on OBS for Basalt: home:defolos:BCI:Staging:Basalt:Basalt-1220
Changes pushed to branch Basalt-1220 as commit 8ac360784a3b9851a42163e80ac9758b6035b404
Build failed ❌

Build Results

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

package name status detail build log
base-image 🚫 unresolvable nothing provides kubic-locale-archive, nothing provides rpm-ndb, nothing provides sles-release, nothing provides skelcd-EULA-bci, nothing provides sle-module-basesystem-release, nothing provides sle-module-server-applications-release, nothing provides sle-module-python3-release live log

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

package name status detail build log
base-image 🚫 unresolvable nothing provides kubic-locale-archive, nothing provides rpm-ndb, nothing provides sles-release, nothing provides skelcd-EULA-bci, nothing provides sle-module-basesystem-release, nothing provides sle-module-server-applications-release, nothing provides sle-module-python3-release live log

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

package name status detail build log
base-image 🚫 unresolvable nothing provides kubic-locale-archive, nothing provides rpm-ndb, nothing provides sles-release, nothing provides skelcd-EULA-bci, nothing provides sle-module-basesystem-release, nothing provides sle-module-server-applications-release, nothing provides sle-module-python3-release live log

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

package name status detail build log
base-image 🚫 unresolvable nothing provides kubic-locale-archive, nothing provides rpm-ndb, nothing provides sles-release, nothing provides skelcd-EULA-bci, nothing provides sle-module-basesystem-release, nothing provides sle-module-server-applications-release, nothing provides sle-module-python3-release live log

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

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

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

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

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

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

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

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

Build failed ❌

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

OS_VERSION=basalt TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/basalt/basalt-1220/ tox -- -n auto
The following images can be pulled from the staging project:

dcermak
dcermak reviewed Jun 5, 2024
View reviewed changes
Comment thread src/bci_build/package/basecontainers.py Outdated
dcermak
dcermak reviewed Jun 5, 2024
View reviewed changes
Comment thread src/bci_build/package/basecontainers.py Outdated
dcermak
dcermak reviewed Jun 5, 2024
View reviewed changes
Comment thread src/bci_build/package/__init__.py Outdated
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from fb82a3f to 5a2eddb Compare June 21, 2024 15:46
dcermak pushed a commit that referenced this pull request Jun 21, 2024
@dirkmueller
Test build for #1220
8ac3607
dcermak pushed a commit that referenced this pull request Jun 21, 2024
@dirkmueller
Test build for #1220
268e2d1
dcermak pushed a commit that referenced this pull request Jun 21, 2024
@dirkmueller
Test build for #1220
652c70a
dcermak pushed a commit that referenced this pull request Jun 21, 2024
@dirkmueller
Test build for #1220
e783fe7
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 5a2eddb to 80468cd Compare July 4, 2024 12:53
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
bdaf385
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
82bf11f
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
d965a8e
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 80468cd to 8999161 Compare July 4, 2024 12:55
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
ba37580
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
8e8c436
@dirkmueller dirkmueller marked this pull request as ready for review July 4, 2024 12:57
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 8999161 to 88a35d8 Compare July 4, 2024 13:07
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
ebe0e6c
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
3520de0
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 88a35d8 to 7b3e989 Compare July 4, 2024 13:11
dcermak pushed a commit that referenced this pull request Jul 4, 2024
@dirkmueller
Test build for #1220
84824df
dcermak
dcermak reviewed Jul 16, 2024
View reviewed changes
Comment thread src/bci_build/templates.py Outdated
dcermak
dcermak reviewed Jul 16, 2024
View reviewed changes
Comment thread src/bci_build/package/__init__.py
@dirkmueller
Copy link
Copy Markdown
Member Author

dirkmueller commented Jul 16, 2024

<package name="patterns-base-minimal_base"/> is new in bootstrap packages. Intentional?
Not there in SUSE:SLE-15-SP5:Update/sles15-image yet

correct, but we'll only do the SP6 image for now. but I've added a condition for it it on SP6

@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 16cddf8 to 3610e02 Compare July 16, 2024 16:25
dcermak pushed a commit that referenced this pull request Jul 16, 2024
Test build for #1220
5686080
@dirkmueller
Copy link
Copy Markdown
Member Author

dirkmueller commented Jul 16, 2024 •
edited
Loading

Can we avoid the duplication? Could be as simple as removing additionaltags from the template.

I'd rather go the other way and remove OBS specific hacks so that builds outside obs work better. moved that to #1423 (which is not working atm because of some bug somewhere)

for now, this is a minor/not a real problem, I would ignore it in order to not block this change from going in further. The tags won't be duplicated.

@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 3610e02 to 80ae5c5 Compare July 16, 2024 17:08
dcermak pushed a commit that referenced this pull request Jul 16, 2024
Test build for #1220
8a4a2a9
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 80ae5c5 to 4d55d7b Compare July 16, 2024 21:44
dcermak pushed a commit that referenced this pull request Jul 16, 2024
Test build for #1220
3f8fc5f
@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 4d55d7b to 26d3657 Compare July 17, 2024 10:57
dcermak pushed a commit that referenced this pull request Jul 17, 2024
Test build for #1220
26c2108
@Vogtinator
Copy link
Copy Markdown
Member

Vogtinator commented Jul 23, 2024

There's duplication even in the kiwi tag:

+          tag="%OS_VERSION_ID_SP%"
+          additionaltags="%OS_VERSION_ID_SP%,%OS_VERSION_ID_SP%.%RELEASE%"

i.e. suse/sle15:%OS_VERSION_ID_SP% is defined three times now :-/

@Vogtinator
Copy link
Copy Markdown
Member

Vogtinator commented Jul 23, 2024

Looks good otherwise.

I'd rather go the other way and remove OBS specific hacks so that builds outside obs work better. moved that to #1423 (which is not working atm because of some bug somewhere)

Where: OBS, kiwi, dockerfile-generator?

@dirkmueller dirkmueller force-pushed the sle15_bci_container branch from 26d3657 to a05ec73 Compare July 23, 2024 09:56
dcermak pushed a commit that referenced this pull request Jul 23, 2024
Test build for #1220
56cdec5
@dirkmueller
Stop duplicating additionaltags for the sle15 container
adfb142 
the code was assuming that first path is always self.name, which is
not the case for the sle15 container as it defines the first path
to be the "extra" compatibility path.
@dirkmueller
Copy link
Copy Markdown
Member Author

dirkmueller commented Jul 23, 2024

There's duplication even in the kiwi tag:

i.e. suse/sle15:%OS_VERSION_ID_SP% is defined three times now :-/

Yes, but it doesn't matter. Yet, I fixed it now.

dcermak
dcermak approved these changes Jul 24, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@dcermak dcermak left a comment

Choose a reason for hiding this comment

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

LGTM, but I'd like @Vogtinator to give his ACK here

dcermak pushed a commit that referenced this pull request Jul 24, 2024
Test build for #1220
07c54fa
@dirkmueller
Copy link
Copy Markdown
Member Author

dirkmueller commented Jul 24, 2024

I'd rather go the other way and remove OBS specific hacks so that builds outside obs work better. moved that to #1423 (which is not working atm because of some bug somewhere)
Where: OBS, kiwi, dockerfile-generator?

I believe a bug in kiwi, but I haven't checked it closely (could be elsewhere). I can see the skopeo call to add the additional names, but they are still not there on the build result. maybe also OBS interaction. needs to be debugged tehre.

Vogtinator
Vogtinator approved these changes Jul 24, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@Vogtinator Vogtinator left a comment

Choose a reason for hiding this comment

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

Looking at the diff between SUSE:SLE-15-SP6:Update and this I don't see anything obvious wrong anymore, just mostly cosmetic issues.

@dcermak dcermak merged commit b949dfb into main Jul 24, 2024
@dcermak dcermak deleted the sle15_bci_container branch July 24, 2024 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Vogtinator Vogtinator Vogtinator approved these changes

@alexandrevicenzi alexandrevicenzi alexandrevicenzi approved these changes

@dcermak dcermak dcermak approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dirkmueller @Vogtinator @alexandrevicenzi @dcermak