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.

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

CLOUD-3860 EAP XP 2.0 OpenShift Image #394

Merged
merged 3 commits into from Dec 15, 2020

Conversation

luck3y
Copy link
Collaborator

@luck3y luck3y commented Dec 8, 2020

https://issues.redhat.com/browse/CLOUD-3860
Signed-off-by: Ken Wills kwills@redhat.com

Thanks for submitting your Pull Request!

Please make sure your PR meets the following requirements:

  • Pull Request title is properly formatted: [CLOUD-XYA] Subject
  • Pull Request contains link to the JIRA issue
  • Pull Request contains description of the issue
  • Pull Request does not include fixes for issues other than the main ticket
  • Attached commits represent units of work and are properly formatted
  • You have read and agreed to the Developer Certificate of Origin (DCO) (see CONTRIBUTING.md)
  • Every commit contains Signed-off-by: Your Name <yourname@example.com> - use git commit -s

- name: eap-xp-10-env
version: "1.0.3"
- name: eap-xp-20-env
version: "2.0.0"
Copy link
Member

Choose a reason for hiding this comment

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

Just a note, as this module is specific to EAP XP2 (eap-xp-20-env), its version should not be tied to 2.0 (it can start with 1.0.0).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Do we want to start with :1.0? I can update these at the same time as making the other changes below.

Copy link
Member

Choose a reason for hiding this comment

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

ok, let's then start at "1.0". thanks!

Copy link
Member

@jmesnil jmesnil left a comment

Choose a reason for hiding this comment

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

@luck3y sorry, I completely missed something (that @jfdenise spotted).

We can not make these changes in the eap-xp directory as we must continue to be able to produce EAP XP 1 images.
Could you move all these files to a eap-xp2 directory so that we are able to produce EAP XP 1 and EAP XP2 images independently. thanks!

@luck3y
Copy link
Collaborator Author

luck3y commented Dec 9, 2020

@jmesnil +1, will do this right now.

@luck3y
Copy link
Collaborator Author

luck3y commented Dec 9, 2020

Moved to eap-xp2 subdir, as requested.


name: "jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift container image."
version: "1.0"
Copy link
Member

Choose a reason for hiding this comment

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

the version of the image should match the version of the EAP XP release to be consistent with our versioning scheme.

E.g current EAP 7 image is at 7.3.4:

version: "7.3.4"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

+1, I had it this way originally, but when we switched over to the new subdir, I thought this should match the version of XP1, which we started at :1.0, but is a bit ambigious. Will update this to be :2.0 again.


name: "jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift runtime image with OpenJDK 11"
version: "1.0"
Copy link
Member

Choose a reason for hiding this comment

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

idem

jfdenise
jfdenise previously approved these changes Dec 10, 2020
@luck3y
Copy link
Collaborator Author

luck3y commented Dec 10, 2020

@jmesnil @jfdenise This should be corrected now, if you have a chance to take a look.

- name: jboss.container.eap.s2i.galleon
- name: jboss.container.eap.galleon
- name: jboss.container.eap.galleon.config.mp
- name: jboss.container.eap.galleon.eap73-compat
Copy link
Contributor

Choose a reason for hiding this comment

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

This module is only required for 1.x and 7.3.x, it should be removed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed, thanks!

@luck3y
Copy link
Collaborator Author

luck3y commented Dec 14, 2020

@jfdenise @jmesnil I've made all the outstanding changes, can you have a look?

@jmesnil jmesnil merged commit 0ba6aac into jboss-container-images:7.3.x Dec 15, 2020
@jmesnil
Copy link
Member

jmesnil commented Dec 15, 2020

@luck3y thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants