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

Fix tests related to recent camel-k-runtime changes #3838

Merged
merged 1 commit into from
Nov 28, 2022

Conversation

claudio4j
Copy link
Contributor

@claudio4j claudio4j commented Nov 23, 2022

The following PR brought knative from camel-quarkus
apache/camel-k-runtime#927

There is an additional merged PR in camel-k-runtime
apache/camel-k-runtime#933

Release Note

Kamelet: In Yaml dsl the `template` keyword was renamed to `routeTemplate`

@claudio4j
Copy link
Contributor Author

The failing test TestRuntimeContainsEmbeddedArtifacts is occurring because camel-k-maven-plugin-1.16.0-SNAPSHOT artifact doesn't contain the fix. Probably next camel-k-runtime snapshot build will contain the fix.

@tadayosi
Copy link
Member

@claudio4j There are a bit more places where they still use camel-k-knative in E2E tests:

Error: 4: > {"level":"error","ts":1669269776.4805422,"logger":"camel-k.maven.build","msg":"[ERROR] Some problems were encountered while processing the POMs:\n[ERROR] 'dependencies.dependency.version' for org.apache.camel.k:camel-k-knative:jar is missing. @ line 25, column 17\n @ ","stacktrace":"github.com/apache/camel-k/pkg/util/log.Logger.Error\n\tgithub.com/apache/camel-k/pkg/util/log/log.go:75\ngithub.com/apache/camel-k/pkg/util/maven.normalizeLog\n\tgithub.com/apache/camel-k/pkg/util/maven/maven_log.go:83\ngithub.com/apache/camel-k/pkg/util/maven.mavenLogHandler\n\tgithub.com/apache/camel-k/pkg/util/maven/maven_log.go:54\ngithub.com/apache/camel-k/pkg/util.scan\n\tgithub.com/apache/camel-k/pkg/util/command.go:77\ngithub.com/apache/camel-k/pkg/util.RunAndLog.func1\n\tgithub.com/apache/camel-k/pkg/util/command.go:56\ngolang.org/x/sync/errgroup.(*Group).Go.func1\n\tgolang.org/x/sync@v0.1.0/errgroup/errgroup.go:75"}

Like:

$ ag camel-k-knative e2e/
e2e/global/builder/build_test.go
54:			"camel-k-knative",

e2e/global/knative/knative_platform_test.go
50:		operatorID := "camel-k-knative"

@squakez
Copy link
Contributor

squakez commented Nov 24, 2022

I've restarted the checks. At this time, the new snapshot is released. For the future: we need to wait that the camel k runtime PR is merged into main and also wait that the build is run once that PR is merged.

@squakez
Copy link
Contributor

squakez commented Nov 24, 2022

@oscerd @claudio4j it seems something is failing when running in native mode.

@squakez
Copy link
Contributor

squakez commented Nov 24, 2022

Some other issue is related to the change in the yaml specification: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_yaml_dsl

@claudio4j
Copy link
Contributor Author

claudio4j commented Nov 24, 2022

I am having a look at these tests, thanks @squakez @tadayosi

@claudio4j claudio4j marked this pull request as draft November 24, 2022 14:09
@claudio4j claudio4j marked this pull request as ready for review November 25, 2022 02:40
@claudio4j claudio4j marked this pull request as draft November 25, 2022 04:59
This PR brought knative from camel-quarkus
apache/camel-k-runtime#927

There is a breaking change related to Yaml dsl, the template keywork was
renamed to routeTemplate
https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_yaml_dsl
@claudio4j claudio4j marked this pull request as ready for review November 25, 2022 05:28
Copy link
Member

@tadayosi tadayosi left a comment

Choose a reason for hiding this comment

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

Thanks!

@tadayosi
Copy link
Member

About this upgrade failure:
https://github.com/apache/camel-k/actions/runs/3545561937/jobs/5953803406

      cli_upgrade_test.go:94: 
          Timed out after 60.020s.
          Expected
              <string>: 
          to equal
              <string>: 1.11.0-SNAPSHOT

It could be that using the default timeout (60s) for this line is too short for snapshot dependencies:
https://github.com/apache/camel-k/blob/main/e2e/namespace/upgrade/cli_upgrade_test.go#L94

@tadayosi tadayosi mentioned this pull request Nov 25, 2022
Copy link
Contributor

@squakez squakez left a comment

Choose a reason for hiding this comment

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

Just a comment. Could you try keeping the usage of template but as a single parameter instead of a list?

pkg/util/dsl/template.go Show resolved Hide resolved
@squakez squakez added this to the 1.11.0 milestone Nov 25, 2022
@claudio4j
Copy link
Contributor Author

It could be that using the default timeout (60s) for this line is too short for snapshot dependencies: https://github.com/apache/camel-k/blob/main/e2e/namespace/upgrade/cli_upgrade_test.go#L94

Agree, let's merge and see next CI test results.

pkg/util/dsl/template.go Show resolved Hide resolved
@oscerd
Copy link
Contributor

oscerd commented Nov 28, 2022

Let's merge, so we can try to release this week.

@oscerd oscerd merged commit e28dc43 into apache:main Nov 28, 2022
@claudio4j claudio4j deleted the fix_ckruntime_changes branch November 28, 2022 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants