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

Rename -jre flavor to openjdk flavor #1675

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Rename -jre flavor to openjdk flavor #1675

merged 1 commit into from
Sep 18, 2024

Conversation

dirkmueller
Copy link
Member

No description provided.

dcermak pushed a commit that referenced this pull request Sep 16, 2024
Test build for #1675
d6df76b
dcermak pushed a commit that referenced this pull request Sep 16, 2024
Test build for #1675
7490162
dcermak pushed a commit that referenced this pull request Sep 16, 2024
Test build for #1675
b31860f
@github-actions GitHub Actions
Copy link

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

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

Build Results

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package name status build log
sac-apache-tomcat-10-java21-image ⛔ excluded live log
spack-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-1675/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1675/containerfile/bci/spack:latest
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp6/6-1675/containerfile/containers/apache-tomcat:10-openjdk21

@github-actions GitHub Actions
Copy link

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

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

Build Results

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package name status build log
sac-apache-tomcat-10-java21-image ⛔ excluded live log
spack-image ⛔ excluded 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-1675/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1675/containerfile/bci/spack:0.21
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-1675/containerfile/containers/apache-tomcat:10-openjdk21

@github-actions GitHub Actions
Copy link

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

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

Build Results

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1675 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
spack-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1675 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
spack-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1675 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
spack-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-1675 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
spack-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-1675/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1675/containerfile/opensuse/apache-tomcat:latest
  • registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-1675/containerfile/opensuse/bci/spack:latest

alexandrevicenzi
alexandrevicenzi approved these changes Sep 16, 2024
View reviewed changes
src/bci_build/package/apache_tomcat.py
@@ -66,13 +66,13 @@ def _get_sac_supported_until(
and os_version.is_tumbleweed
),
version="%%tomcat_version%%",
tag_version=f"{tomcat_major}-jre{jre_version}",
tag_version=f"{tomcat_major}-openjdk{jre_version}",
Copy link
Member

Choose a reason for hiding this comment

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

nit: rename jre_version to jdk_version since we are talking about JDK and not JRE.

Copy link
Member Author

Choose a reason for hiding this comment

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

well, we still only install the JRE not the JDK (but we name the tag suffix jdk which I find a bit confusing as well)..

Copy link
Collaborator

Choose a reason for hiding this comment

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

Why are you proposing to change the tag suffix then if it's now more confusing?

Copy link
Member

Choose a reason for hiding this comment

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

the package list is f"java-{jre_version}-openjdk", f"java-{jre_version}-openjdk-headless", is this JRE only? I thought it was JDK

Copy link
Member Author

Choose a reason for hiding this comment

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

no, the jdk is the java-{jre_version}-openjdk-devel

@dirkmueller dirkmueller merged commit 04538e2 into main Sep 18, 2024
9 checks passed
@dirkmueller dirkmueller deleted the openjdk_suffix branch September 18, 2024 16:39
@dcermak dcermak mentioned this pull request Sep 20, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandrevicenzi alexandrevicenzi alexandrevicenzi approved these changes

@dcermak dcermak dcermak left review comments

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
@dirkmueller @alexandrevicenzi @dcermak