1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00
Commit Graph

798 Commits

Author SHA1 Message Date
Marcus Holl
9cd31e7236 Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 13:27:29 +02:00
Marcus Holl
e2e6f5d401
Merge pull request #281 from marcusholl/defaultValueCacheInstanceLikeChecks
Make DefaultConfigurationCache instance checks more precise
2018-09-21 13:26:43 +02:00
Marcus Holl
f07b596c46 Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 12:48:14 +02:00
Marcus Holl
4fbf9b1df5
Merge pull request #286 from marcusholl/pr/ReplaceGStrings
replace GStrings in configuration by correspoding java.lang.Strings
2018-09-21 12:46:51 +02:00
Marcus Holl
8a5685bae7 Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 12:18:25 +02:00
Marcus Holl
0919f23ff1
Merge pull request #296 from marcusholl/pr/fixWrongLinkToContributionGuidelines
Fix not working link to contribution guidelines
2018-09-21 12:15:47 +02:00
Marcus Holl
dc1c57ccca Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 11:26:04 +02:00
Marcus Holl
9399588f5d
Merge pull request #300 from marcusholl/pr/moveGitUtilsMockToGitUtilsTestClass
Remove generic gitUtils from BasePiperTest
2018-09-21 11:25:19 +02:00
Marcus Holl
123ce3a603 Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 11:20:14 +02:00
Marcus Holl
154750d98d
Merge pull request #301 from marcusholl/pr/noStashUnstashOutputWrittenByTests
Remove output to stdout from tests
2018-09-21 11:18:39 +02:00
Marcus Holl
42188d3a4f Merge remote-tracking branch 'github/master' into HEAD 2018-09-21 11:13:07 +02:00
Marcus Holl
5b28c787ab
Merge pull request #304 from marcusholl/pr/fixMissingGettersAndSetters
Revert "Remove explict getters and setters from common pipeline envir…
2018-09-21 10:18:15 +02:00
Marcus Holl
341cb97c25 Revert "Remove explict getters and setters from common pipeline environment"
This reverts commit d22af0f9d4.
2018-09-21 09:24:47 +02:00
Marcus Holl
23af245ad9
Merge pull request #302 from marcusholl/pr/noExplictGetterAnDSettersInCommonPipelineEnvironment
Remove explict getters and setters from common pipeline environment
2018-09-19 09:13:21 +02:00
Marcus Holl
d22af0f9d4 Remove explict getters and setters from common pipeline environment
We get getters and setters generated automatically.
2018-09-17 16:51:13 +02:00
Marcus Holl
657ccf7d91
Merge pull request #294 from marcusholl/pr/premoveDeclarationsOfPrepareObjectInterceptors
Remove not (really) needed declarations of prepareObjectInterceptors
2018-09-14 10:36:42 +02:00
thorstenwillenbacher
1420c8a5bd
Merge branch 'master' into pr/premoveDeclarationsOfPrepareObjectInterceptors 2018-09-14 10:12:26 +02:00
Marcus Holl
c1900f6ecd Remove output to stdout from tests
In fact nobody reads it, but on some IDEs it is shown when tests are executed.
2018-09-14 09:08:52 +02:00
Marcus Holl
dc9ce9a732 Remove generic gitUtils from BasePiperTest
there is only one test class making use of it left. This test class is the
GitUtilsTest itself.

Hence moving this member downwards in the test class hierarchy into GitUtilsTest.

I doubt it makes sense to make use of a generic git utils mock somewhere else since this basically
means to test the GitUtils class in the conxtext of other examinees. For that there is no need.
The GitUtils class should be tested by the corresponding test class, but not in a transive manner
by other tests. For all other tests a specific git utils mock should be provided mocking the corresponding
method class. This is already the case today, otherwise we would have more test classes making use
of the generic git utils mock.
2018-09-13 16:01:35 +02:00
Marcus Holl
2d29555811 Fix not working link to contribution guidelines 2018-09-13 11:09:24 +02:00
Marcus Holl
7f171429bc
Merge pull request #290 from marcusholl/pr/execClosureFromShellCallRule
Execute closures when evaluating shell calls
2018-09-12 11:19:47 +02:00
Marcus Holl
8afec9b4dc Merge remote-tracking branch 'github/master' into HEAD 2018-09-12 11:14:03 +02:00
Marcus Holl
d919335b06
Merge pull request #293 from marcusholl/pr/removeMockHelper
Remove obsolete code: mockHelper
2018-09-12 11:12:57 +02:00
Marcus Holl
9c4652ddab Merge remote-tracking branch 'github/master' into HEAD 2018-09-12 11:02:31 +02:00
Marcus Holl
d31e0e73cb Remove not (really) needed declarations of prepareObjectInterceptors
- In ArtifactSetVersionTest the method was declared,
    but not used at all.
  - In MtaUtilsTest there was a particular Object created
    for the sole purpose of serving as script.
    For that we have the nullScript.
  - In DockerArtifactVersioningTest 'this' was configured to
    serve as script. There is basically no reason why the
    instance of the JUnitTest should serve as script.
    Instead we have the nullScript for that purpose.
2018-09-10 16:52:44 +02:00
Marcus Holl
59d831d735
Merge pull request #285 from marcusholl/pr/removeMergeMethodFromConfigMerger
Remove not needed merge method from ConfigurationMerger
2018-09-10 16:24:37 +02:00
Christopher Fenner
bb98ba71f3
Merge branch 'master' into pr/removeMergeMethodFromConfigMerger 2018-09-10 15:02:58 +02:00
Sven Merk
61de848114
Merge branch 'master' into pr/removeMockHelper 2018-09-10 14:03:07 +02:00
Marcus Holl
308c4c772e
Merge pull request #291 from marcusholl/pr/mockGitUtilsForArtifactSetVersionTests
mock GitUtils
2018-09-10 13:59:41 +02:00
Marcus Holl
aedfb13a6b Merge remote-tracking branch 'github/master' into HEAD 2018-09-10 13:52:22 +02:00
Marcus Holl
9e378d6b46 Remove obsolete code: mockHelper
in fact the MockHelper seems not to be used anymore. Apparently fully
superseded by our JenkinsRules.
2018-09-10 13:44:42 +02:00
Christopher Fenner
d07b64f477
Merge branch 'master' into pr/removeMergeMethodFromConfigMerger 2018-09-10 13:32:01 +02:00
Marcus Holl
c0c0adbeda Prune useless code from MTABuild test. (#288)
should have been removed earlier with the other pull request removing writing the test files.
This is pure leftover.
2018-09-10 13:28:11 +02:00
Marcus Holl
55a952522b ConfigurationHelper: replace all occurences of GString by java.lang.String
GStrings might be handed over e.g. via signature to steps.

GStrings in configuration makes it harder to deal with configurations.
E.g.
   ```if(param == 'a' || param == 'b')``` returns true if a is a GString representing 'a'
but
   ```if(param in ['a', 'b'])``` returns false.

It would be possible not to use the ```in``` notation in our code. But this
increases readability.

GString are not significant and can be replaced by the corresponding java.lang.String
representation without loss of information. Hence it is justified IMO to ensure
there are no GStrings contained in the configuration map.
2018-09-10 10:10:19 +02:00
Marcus Holl
68ab5bacd6 mock GitUtils
if we don't mock the GitUtils here changes inside GitUtils affecting the git commands
issued at the command line requires changes here. In fact we have to react on
implementation details of the GitUtils here. It is better to be independent from that
implementation details here since this leads to more focused and smaller commits.
2018-09-07 16:14:00 +02:00
Marcus Holl
cce1eb0f9a Execute closures when evaluating shell calls
This allows us to e.g. also throw exceptions (e.g. hudson.AbortException) when dealing with
mocked shell calls.
2018-09-07 15:27:55 +02:00
Marcus Holl
bc7b1e0890
Merge pull request #284 from marcusholl/pr/artifactSetVersionStreamlineGitHandling
Do only what is really needed inside the body of sshAgent
2018-09-06 12:46:54 +02:00
Marcus Holl
685756f09d Invoke method 'use' before returning configuration values
In order to ensure all actions applied by 'use()' are also
applied before returning a single configuration values.

Possible optimization: introduce a flag indicating that 'use' has
been called (not implemented for now).
2018-09-06 12:17:57 +02:00
Marcus Holl
b65eca35b2 MapUtils: Provide method for traversing of nested maps. 2018-09-06 12:17:55 +02:00
Marcus Holl
c5cce5a3a3 Remove not needed merge method from ConfigurationMerger
The other merge method called in the body of that method here does not exist.
So any call to this method would end up in some method not found exception or similar.
2018-09-06 09:25:53 +02:00
Christopher Fenner
7b49858233
Merge branch 'master' into pr/artifactSetVersionStreamlineGitHandling 2018-09-05 11:46:11 +02:00
Christopher Fenner
e65ec98144
correct indent 2018-09-05 11:44:40 +02:00
Marcus Holl
12d8f48c38 Do only what is really needed inside the body of sshAgent
- there is no need to do the git commit inside the body of sshAgent
- there is no need to do the git tag inside the body of sshAgent

- side catch: availablility of git user name and git user email is
  checked at its own. If one is missing the other may be present
  ~somehow~ in the configuration.
2018-09-04 17:04:07 +02:00
Florian Wilhelm
50ac5b0ac9
Execute MTA builder in Docker 2018-09-04 11:32:54 +02:00
Marcus Holl
1e50b26f19
Merge pull request #277 from marcusholl/pr/readYaml
Improve JenkinsRule for reading yaml files / mta build without absolute pathes
2018-09-04 11:04:20 +02:00
Marcus Holl
cb3860ffe9 remove not needed closure when registering yaml file 2018-09-04 10:50:03 +02:00
Marcus Holl
138a41f02a Merge remote-tracking branch 'github/master' into work 2018-09-04 10:42:36 +02:00
Marcus Holl
6b7dc48c44 Be more flexible with JenkinsReadYaml rule
When we register a closure as file, the closure will be exectutd.
Otherwise we return what is registered.

This gives us a maximum level of flexibility. We can throw exceptions (e.g. FileNotFound) as
as test setup requires this, in simple cases we provide the yaml as a string.
2018-09-04 09:46:59 +02:00
Marcus Holl
fb425a4c70 Register empty pipeline config yml by default 2018-09-03 15:43:17 +02:00
Marcus Holl
94241f1a6c Register yaml content at beginning of test 2018-09-03 15:43:17 +02:00