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

ENTESB-11729: Upgrade of fuse-camel #6735

Merged
merged 1 commit into from Sep 26, 2019

Conversation

phantomjinx
Copy link
Contributor

  • Bumps version to 2.21.0.fuse-750029

  • Corrects odata tests to conform with upstream change.

@pure-bot pure-bot bot added the pr/review-requested Use this if you want to have a review. pure-bot will prevent merging if set and no review given label Sep 25, 2019
@syndesisio-bot
Copy link

@phantomjinx The bot could not transition the ticket automatically, please update this Jira ticket manually: https://issues.jboss.org/browse/ENTESB-11729

Copy link
Collaborator

@chirino chirino left a comment

Choose a reason for hiding this comment

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

LGTM

@pure-bot
Copy link
Contributor

pure-bot bot commented Sep 25, 2019

Pull request approved by @chirino - applying pr/approved label

@pure-bot pure-bot bot added the pr/approved Applied by pure-bot when a review is approved label Sep 25, 2019
Copy link
Collaborator

@oscerd oscerd left a comment

Choose a reason for hiding this comment

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

Have the artifact been pinned?

Copy link
Collaborator

@oscerd oscerd left a comment

Choose a reason for hiding this comment

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

I believe you need to update the camel-k catalog too

@phantomjinx
Copy link
Contributor Author

phantomjinx commented Sep 26, 2019

Have the artifact been pinned?

I assume so as I didn't promote it. Another fuse project had already done that & upgraded to it.
Can't actually access https://repository.jboss.org/nexus either at the moment (just remains spinning "Loading Nexus UI").

@oscerd

@phantomjinx
Copy link
Contributor Author

I believe you need to update the camel-k catalog too

Have searched through the syndesis codebase and can't find any other references to 2.21.0.fuse-7500 other than these:

extension/bom/pom.xml:    <camel.version>2.21.0.fuse-750029</camel.version>
integration/bom-camel-k/pom.xml:    <camel.version>2.21.0.fuse-750029</camel.version>
integration/bom/pom.xml:    <camel.version>2.21.0.fuse-750029</camel.version>
pom.xml:    <camel.version>2.21.0.fuse-750029</camel.version>

Can you point to what I've missed?

Thx.

@oscerd

@oscerd
Copy link
Collaborator

oscerd commented Sep 26, 2019

There is a reference here:

install/operator/build/conf/config.yaml
install/operator/pkg/generator/assets/addons/camelk/camel-catalog-2.21.0.fuse-750007.yaml.tmpl

I think this must be overriden from integration/camel-k build

@nicolaferraro @valdar right?

@nicolaferraro
Copy link
Contributor

Yes, please the config.yaml file needs to be updated with the new version of Camel and a new camel-catalog-${version}.yaml.tmpl needs to be added to the list of resources added by the camel k addon in the operator (look at the existing one install/operator/pkg/generator/assets/addons/camelk/camel-catalog-2.21.0.fuse-750007.yaml.tmpl for ref on how to generate it).

This is needed only for upstream bits to work in camel k mode (not needed in prod build).

We can get rid of this manual process when we switch to camel k 1.x and camel 3.x.

@phantomjinx
Copy link
Contributor Author

@nicolaferraro @oscerd
Been through all the codebase now with

grep -r 2\\.21\\.0 * | grep -v node_modules | grep -v target | grep -v yarn | grep -v json | grep -v svg | grep -v apicurio | grep -v Binary | grep -v 29

so all references to 2.21.0.fuse-750007 not update to ...029 except for

doc/shared/attributes.adoc::camelFullVersion: 2.21.0.fuse-740039-redhat-00001

Know if that should be updated too?
Looks like it hasn't been updated in a while although it is seems a product version.

* Bumps version to 2.21.0.fuse-750029

* Corrects odata tests to conform with upstream change.
@pure-bot pure-bot bot merged commit 646b58b into syndesisio:master Sep 26, 2019
@syndesisio-bot
Copy link

@phantomjinx The bot could not transition the ticket automatically, please update this Jira ticket manually: https://issues.jboss.org/browse/ENTESB-11729

@oscerd
Copy link
Collaborator

oscerd commented Sep 26, 2019

Pinned the needed bits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.8.x pr/approved Applied by pure-bot when a review is approved pr/review-requested Use this if you want to have a review. pure-bot will prevent merging if set and no review given
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants