remove minor versions for tomcat #1669

dirkmueller · 2024-09-13T14:55:28Z

there should be "branch" (which is major version) and fullversion-flavor.

github-actions · 2024-09-13T14:56:18Z

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

Build Results

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

package name	status	build log
sac-apache-tomcat-10-java21-image	⛔ excluded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	⛔ excluded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	⛔ excluded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	⛔ excluded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	✅ succeeded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	✅ succeeded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-image	⛔ excluded	live log

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

package name	status	build log
sac-apache-tomcat-10-java21-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-1669/ tox -- -n auto

The following images can be pulled from the staging project:

registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1669/containerfile/containers/apache-tomcat:10.1-openjdk21

github-actions · 2024-09-13T14:56:27Z

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

Build Results

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package name	status	build log
init-image	✅ succeeded	live 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-1669/ tox -- -n auto

The following images can be pulled from the staging project:

registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1669/containerfile/bci/bci-init:15.7
registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1669/containerfile/bci/kiwi:9

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

github-actions · 2024-09-13T14:56:40Z

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

Build Results

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

package name	status	build log
apache-tomcat-10-java-17-image	⛔ excluded	live log
apache-tomcat-10-java-21-image	⛔ excluded	live log
apache-tomcat-10-java-22-image	⛔ excluded	live log
apache-tomcat-9-java-17-image	⛔ excluded	live log

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

package name	status	build log
apache-tomcat-10-java-17-image	⛔ excluded	live log
apache-tomcat-10-java-21-image	⛔ excluded	live log
apache-tomcat-10-java-22-image	⛔ excluded	live log
apache-tomcat-9-java-17-image	⛔ excluded	live log

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

package name	status	build log
apache-tomcat-10-java-17-image	✅ succeeded	live log
apache-tomcat-10-java-21-image	✅ succeeded	live log
apache-tomcat-10-java-22-image	✅ succeeded	live log
apache-tomcat-9-java-17-image	✅ succeeded	live log

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

package name	status	build log
apache-tomcat-10-java-17-image	✅ succeeded	live log
apache-tomcat-10-java-21-image	✅ succeeded	live log
apache-tomcat-10-java-22-image	✅ succeeded	live log
apache-tomcat-9-java-17-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-1669/ tox -- -n auto

The following images can be pulled from the staging project:

registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1669/containerfile/opensuse/apache-tomcat:latest

alexandrevicenzi · 2024-09-16T14:18:41Z

src/bci_build/package/apache_tomcat.py

        ],
        cmd=[
            f"/usr/{'libexec' if os_version in (OsVersion.TUMBLEWEED, OsVersion.SLE16_0) else 'lib'}/tomcat/server",
            "start",
        ],
        exposes_tcp=[8080],
        env={
-            "TOMCAT_MAJOR": tomcat_major,
+            "TOMCAT_MAJOR": math.floor(tomcat_ver),


nit: int(tomcat_ver) achieves the same thing and does not require an extra library import.

alexandrevicenzi · 2024-09-16T14:21:41Z

src/bci_build/package/apache_tomcat.py

-        (10, OsVersion.TUMBLEWEED, 22),
-        (10, OsVersion.TUMBLEWEED, 21),
-        (10, OsVersion.TUMBLEWEED, 17),
+    for tomcat_ver, os_version, jre_version in (


if you are hardcoding versions already, why not include tomcat_ver_major and avoid any math conversions?

deriving it from one value is more DRY than duplicating it in the tuple, imho.

dcermak

Floats are imho not the right way to handle version numbers due to potential representation & rounding issues. I'd suggest to use either strings or instances of packaging.Version

github-actions · 2024-09-19T13:33:01Z

Created a staging project on OBS for 16.0: home:defolos:BCI:Staging:16.0:16.0-1669
Changes pushed to branch 16.0-1669 as commit 169fed590dc170b59daeb6066a118954a72acd22
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️
⚠️⚠️ Project and Branch have been deleted ⚠️⚠️

github-actions · 2024-09-19T13:33:08Z

Created a staging project on OBS for 5: home:defolos:BCI:Staging:SLE-15-SP5:5-1669
Changes pushed to branch 5-1669 as commit 37b4b5b68c98bd43f9464bc33d355c4d69283d4b
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for x86_64: current state: published
Build results:

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

Repository images in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for aarch64: current state: published
Build results:

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

Repository images in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for s390x: current state: published
Build results:

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

Repository images in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for ppc64le: current state: published
Build results:

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

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for x86_64: current state: published
Build results:

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

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for aarch64: current state: published
Build results:

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

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for s390x: current state: published
Build results:

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

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP5:5-1669 for ppc64le: current state: published
Build results:

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

Build succeeded ✅

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

OS_VERSION=15.5 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/sle-15-sp5/5-1669/ tox -- -n auto

The following images can be pulled from the staging project:

registry.opensuse.org/home/defolos/bci/staging/sle-15-sp5/5-1669/containerfile/bci/bci-init:15.5

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

⚠️ Project and Branch have been deleted ⚠️

⚠️

dcermak

LGTM, only have one nitpick

src/bci_build/package/apache_tomcat.py

We should only have the tags for the listed product versions and their patch releases.

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

3476589

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

11fdd76

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

ad79fff

dirkmueller force-pushed the tomcat_no_minor branch from 7e2b197 to 127459c Compare September 13, 2024 16:05

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

24d3b1e

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

391c476

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

9276f5e

dirkmueller force-pushed the tomcat_no_minor branch from 127459c to 7d9b753 Compare September 13, 2024 17:32

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

5c5335c

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

f6e0038

dcermak pushed a commit that referenced this pull request Sep 13, 2024

Test build for #1669

b0aced7

alexandrevicenzi reviewed Sep 16, 2024

View reviewed changes

dcermak reviewed Sep 17, 2024

View reviewed changes

dirkmueller force-pushed the tomcat_no_minor branch from 7d9b753 to 644646b Compare September 19, 2024 12:52

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

4f8d6b7

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

78f83f3

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

1799544

dirkmueller force-pushed the tomcat_no_minor branch from 644646b to 6b7975b Compare September 19, 2024 13:32

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

faf1d7c

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

6d36dd4

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

5ca19cf

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

e0b234e

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

d4792a6

dirkmueller force-pushed the tomcat_no_minor branch from 6b7975b to 9d2f544 Compare September 19, 2024 13:37

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

37b4b5b

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

169fed5

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

f906fcb

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

dcf0044

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

13c6775

dcermak reviewed Sep 19, 2024

View reviewed changes

src/bci_build/package/apache_tomcat.py Outdated Show resolved Hide resolved

dirkmueller force-pushed the tomcat_no_minor branch from 9d2f544 to 3778971 Compare September 19, 2024 15:55

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

ae6ceb5

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

ddf0ce6

dirkmueller force-pushed the tomcat_no_minor branch from 3778971 to 7df627e Compare September 19, 2024 15:58

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

5e2a742

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

675ce83

remove major versions for tomcat

0191b9c

We should only have the tags for the listed product versions and their patch releases.

dirkmueller force-pushed the tomcat_no_minor branch from 7df627e to 0191b9c Compare September 19, 2024 16:32

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

e426766

dcermak pushed a commit that referenced this pull request Sep 19, 2024

Test build for #1669

762f98e

dcermak merged commit 146630d into main Sep 19, 2024
9 checks passed

dcermak deleted the tomcat_no_minor branch September 19, 2024 16:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove minor versions for tomcat #1669

remove minor versions for tomcat #1669

dirkmueller commented Sep 13, 2024

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

alexandrevicenzi Sep 16, 2024

alexandrevicenzi Sep 16, 2024

dirkmueller Sep 19, 2024

dcermak left a comment

github-actions bot commented Sep 19, 2024 •

edited

Loading

github-actions bot commented Sep 19, 2024 •

edited

Loading

dcermak left a comment

remove minor versions for tomcat #1669

remove minor versions for tomcat #1669

Conversation

dirkmueller commented Sep 13, 2024

github-actions bot commented Sep 13, 2024 • edited Loading

github-actions bot commented Sep 13, 2024 • edited Loading

github-actions bot commented Sep 13, 2024 • edited Loading

alexandrevicenzi Sep 16, 2024

Choose a reason for hiding this comment

alexandrevicenzi Sep 16, 2024

Choose a reason for hiding this comment

dirkmueller Sep 19, 2024

Choose a reason for hiding this comment

dcermak left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 19, 2024 • edited Loading

github-actions bot commented Sep 19, 2024 • edited Loading

dcermak left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 19, 2024 •

edited

Loading

github-actions bot commented Sep 19, 2024 •

edited

Loading