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: KarafGenerator update #214

Merged
merged 1 commit into from Jun 1, 2020
Merged

Conversation

manusa
Copy link
Member

@manusa manusa commented May 28, 2020

  • Created Karaf Quickstart
  • Fixed problems with FileSet assembly config to include complete directories
  • Upgraded images to use quay.io/jkube/jkube-karaf-binary-s2i

n.b. CompleteK8sITCase will fail due to an invalid assertion. In the past filesets entries were copied (in all cases) to the target directory under a subdirectory named like the source parent directory, which is wrong.)
The failing line should be replaced

  • From:
assertThat(imageFiles, hasItem("/deployments/jkube-includes/will-be-included-if-no-assemblies-defined.txt"));
  • To:
    assertThat(imageFiles, hasItem("/deployments/will-be-included-if-no-assemblies-defined.txt"));

I'll update integration-tests once this PR gets merged.

Relates to: #183 #188 #94

@manusa manusa force-pushed the feature/karaf branch 2 times, most recently from 32b4d63 to 3658bef Compare May 28, 2020 18:06
@codecov
Copy link

codecov bot commented May 28, 2020

Codecov Report

Merging #214 into master will increase coverage by 0.31%.
The diff coverage is 90.62%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #214      +/-   ##
============================================
+ Coverage     26.76%   27.08%   +0.31%     
- Complexity     1626     1661      +35     
============================================
  Files           350      351       +1     
  Lines         18308    18323      +15     
  Branches       2801     2804       +3     
============================================
+ Hits           4900     4962      +62     
+ Misses        12848    12799      -49     
- Partials        560      562       +2     
Impacted Files Coverage Δ Complexity Δ
...re/assembly/DockerAssemblyConfigurationSource.java 61.53% <ø> (ø) 9.00 <0.00> (ø)
...kit/build/core/assembly/DockerAssemblyManager.java 48.66% <0.00%> (+6.33%) 27.00 <0.00> (ø)
...core/assembly/JKubeAssemblyConfigurationUtils.java 96.15% <ø> (ø) 5.00 <0.00> (ø)
...e/jkube/kit/build/service/docker/BuildService.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
...config/handler/property/PropertyConfigHandler.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
...clipse/jkube/kit/common/AssemblyConfiguration.java 8.33% <ø> (ø) 2.00 <0.00> (?)
...ava/org/eclipse/jkube/kit/common/AssemblyMode.java 0.00% <ø> (ø) 0.00 <0.00> (?)
...ube/kit/config/image/build/BuildConfiguration.java 20.30% <ø> (ø) 20.00 <0.00> (ø)
...onfig/service/openshift/OpenshiftBuildService.java 53.01% <ø> (ø) 46.00 <0.00> (ø)
...clipse/jkube/generator/webapp/WebAppGenerator.java 88.00% <ø> (ø) 13.00 <0.00> (ø)
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2076887...1a5ae1e. Read the comment docs.

@manusa manusa force-pushed the feature/karaf branch 3 times, most recently from c841b46 to cf6a116 Compare May 29, 2020 13:10
- Created Karaf Quickstart
- Fixed problems with FileSet assembly config to include complete directories
- Upgraded images to use quay.io/jkube/jkube-karaf-binary-s2i

Signed-off-by: Marc Nuri <marc@marcnuri.com>
@sonarcloud
Copy link

sonarcloud bot commented Jun 1, 2020

SonarCloud Quality Gate failed.

Bug B 1 Bug
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 20 Code Smells

32.0% 32.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (1.8.0_131) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

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

2 participants