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

1217 Commits

Author SHA1 Message Date
Marcus Holl
0dd74fe684 GitUtils: provide method for checking worktree is clean. 2018-09-07 12:38:14 +02:00
Marcus Holl
8db2aaf5f0 don't use load step defaults as implicit factory method. 2018-09-07 10:08:16 +02:00
Marcus Holl
5f66113c37 no script in method signatures. 2018-09-06 16:45:30 +02:00
Marcus Holl
2b95be12aa Ensure proper initialization of ConfigurationHelper
Up to now we had two constructors, one with a Script and the other one with a map holding some defaults.
In case the constructor with the map was called the step name was uninitialized
2018-09-06 16:21:38 +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
Marcus Holl
26ecbe5013 Provide option for registering file for read yaml.
We can now registering files to JenkinsReadYamlRule by
providing the file name alongside with the expected content
(or e.g. an expception)

With that change it is possible to remove pwd statements
from mtaBuild. These statements was used in order to pass
a temporary directory inside the mtaBuild (code under test).
This is not needed anymore since we can register the files
directly.

Having pwd implies working with absolute pathes which is
also a no-go when working with docker, since the absolute
pathes inside and outside docker are normally not the same.

For pathes relative to a build root directory it is rather
easy to keep the pathes consistent the same.

Adjust sources according to registering yaml file to jenkins rule.

For mtaBuild this means also: get ride of absolute pathes for denoting the yaml file.
Having absolute pathes makes it difficult/impossible to work also with dockerized versions
of mtaBuild since the absolute pathes are most probably not the same inside and outside
the docker container, but the relatives pathes can be kept the same easily.
2018-09-03 15:43:15 +02:00
Marcus Holl
5cca5fddbb Tests: make use of JenkinsCredentialsRule
JenkinsCredentialsRule now closer to reality since it mimics
the bevavior or the credentials plugin in case a credential
is not known.
2018-09-03 12:28:08 +02:00
Marcus Holl
c54b6e6cf2 Make DefaultConfigurationCache instance checks more precise
up to now we check some values provided by the DefaultConfigurationCache. This is some kind
of plausibility check, but this is not really a check that the instance did not change.

With the tests as they are now we check in fact for a new instance.
2018-09-03 09:38:41 +02:00
Marcus Holl
b6fd507145 Be more precise with libraryResource and read yaml in prepareDefaultValuesTest
In the free wild it is the duty of libraryResource to provide some resource as text
and it is the duty of readYaml to parse a text (... would also be possible to read
a file instead just parsing text, but that is a different story).

In our setup we just forwarded the resource name in libraryResource and reacted on
that resource name inside read yaml. There was no yaml parsing at all, the yaml 'as
it' was returned.

The approach now is much closer to reality. Library resource now provides the
text 'behind' the resource and yaml parses it. There is now a real yaml parsing.
Read yaml is now not registered explicitly anymore. It is just the readYaml closure
which is registerd by default for our tests.
2018-09-03 09:24:57 +02:00
Marcus Holl
c93c1079cc
Merge pull request #268 from marcusholl/pr/alignMixinOrder
align step stage mixin order among pipeline steps
2018-09-03 08:38:56 +02:00
Marcus Holl
729f0a7f09 Merge remote-tracking branch 'github/master' into HEAD 2018-09-03 08:33:26 +02:00
Marcus Holl
f2feb8f5ad Ensure consistent location for files used by versioning tests (#278) 2018-08-31 14:13:11 +02:00
Marcus Holl
8a019f5b86 Remove read yaml rule from common rules
read yaml rule is a very frequently used rule. But having the rule in the common rules
means we cannot register text or files to that rule, which makes it less handy to work
with yaml files in the tests.
2018-08-31 10:22:46 +02:00
Marcus Holl
777cacf156
Merge pull request #272 from marcusholl/pr/docuFixMarkup
[docu] fix markup
2018-08-30 12:46:55 +02:00
Marcus Holl
2f9310b963
Merge branch 'master' into pr/docuFixMarkup 2018-08-30 12:42:34 +02:00
Christopher Fenner
55ee41a23c
Merge branch 'master' into pr/alignMixinOrder 2018-08-30 11:04:16 +02:00
Christopher Fenner
704c5a1a17
neoDeploy: add web analytics (#269)
* add web analytics

* Update neoDeploy.groovy

* Update neoDeploy.groovy
2018-08-30 11:03:34 +02:00
Marcus Holl
42c1032f06 [docu] fix markup
The coding box was too long since the closing markup for the code box
had a leading blank, hence the end of the code box was not properly detected.
2018-08-30 08:52:15 +02:00
Marcus Holl
b7e19da716 align step stage mixin order among pipeline steps 2018-08-29 10:31:01 +02:00
Christopher Fenner
4425629ee7
notify about deactivated SWA reporting (#261)
* report deactivated SWA reporting

* Update Utils.groovy

* add tests

* add test cases

* use hamcrest matchers in tests

* check for missing call to web analytics

* Update UtilsTest.groovy
2018-08-29 10:01:16 +02:00
Marcus Holl
23b4cd33e7
Merge pull request #266 from rodibrin/pr/changemanagement-quotefilepath
cmclient call needs to quote the file path
2018-08-29 09:27:05 +02:00
Roland Stengel
67429626a7 cmclient call needs to quote the file path 2018-08-28 15:29:08 +02:00
Thorsten Duda
e7d0f6b1ca
Merge pull request #264 from marcusholl/pr/emitCMCommandsToLog
Emit cm command line to log.
2018-08-28 11:45:22 +02:00
Marcus Holl
004c310d0e Emit cm command line to log. 2018-08-28 10:07:37 +02:00
Marcus Holl
8c84bc67cd
Merge pull request #260 from marcusholl/pr/artifactSetVersionInsideWorktree
[refactoring] artifactSetVersion: use gitUtils#insideWorkTree
2018-08-23 14:08:57 +02:00
Marcus Holl
21b8980153 Merge remote-tracking branch 'github/master' into HEAD 2018-08-23 14:04:50 +02:00
Marcus Holl
edee92020c No versionBackup files for mvn versioning (#259) 2018-08-22 09:59:19 +02:00
Ramachandra Kamath Arbettu
c84114c3df
Enable support for executing on K8S as a step (#231)
* Create executeDockerOnKubernetes.groovy

* Update dockerExecute.groovy

* Create SysEnvTest.groovy

* Update default_pipeline_environment.yml

* Update executeDockerOnKubernetes.groovy

* Create utils object

* update docker image

* Update mavenExecute.groovy

* Use pipeline-lib than piper

* Check container name

* Always change ownership to 1000

* Check for map

* Fix command

* Move chmod to docker execute

* Use generic name for the pod

* runAsPod has been added

* Return false if script has no k8smapping

* fix syntax error

* Null checks

* Returnn dockerImage name

* Check method body

* Return container name

* Cleanup echos

* Use runAsPod

* Rename step

* Use official jenkins JNLP agent image

* Construct containersMap

* Check if kubernetes plugin is active

* Support JaaS

* pass script object

* Move configuration to default section

* Use generic flag to check if running in k8s

* fix jnlp agent name

* Solve travis errors

* Improvements to config and changes to name of the method

* Improvements to config

* Fix type

* Rename stash config

* add import

* Fix map order

* Fix jnlp agent name

* cleanup config usage

* Check if config is enabled

* Use nested k8s mapping

* Support custom docker workspace and move flag to env

* Feature/k8s stage (#1)

* Use nested k8s mapping

* Support custom docker workspace and move flag to env

* Check dockerOptions value

* Support local execution

* Add tests for dockerExecute

* Move config to step and Fix tests

* Use step configuration while running as a pod

* Streamline parameter and config initialization

* Streamline parameter and tests

* Cleanup and align variable name

* Use default JNLP agent if one not defined in config

* Add tests for runInsidePod. Ensure lowercase container names.

* Improve tests and remove unused code block

* Fix permission issues

* Perform stashing and unstashing inside container

* Use custom jnlp agent due to user id restriction

* Fix tests after jnlp agent change

* Address review comments

* Initialize script to default value if null

* Address review comments

* Update exeception handling and documentation

* Improve documentation

* correct indent

* Link documents to the index page

* Merge containerExecute and dockerExecuteOnKuberenetes step and address comments.

* Update dockerExecute.md

* Update dockerExecuteOnKubernetes.md

* Update default_pipeline_environment.yml

* update documentation

* Update documentation. Use annotation for singleton

* Update DockerExecuteOnKubernetesTest.groovy

* Update dockerExecute.groovy

* Update dockerExecuteOnKubernetes.groovy

* Improve documentation and test case names

* neoDeploy: switch to chained ConfigurationHelper (#244)

* switch neoDeploy to chained ConfigurationHelper

* update imports

* Improve tests

* Address review comments

* Improve documentation

* made dockerImage non-mandatory parm, improved test

* add comment regarding userid assumption
2018-08-21 15:45:59 +02:00
Marcus Holl
8ee298186d
Merge pull request #256 from marcusholl/pr/streamlineGitCalls
[refactoring] streamline git calls
2018-08-21 14:06:23 +02:00
Marcus Holl
044e940dec No need for manipulating origin url
the gitSshUrl can be provided directly to the push call. This avoids footprint on the build
servers git repository.
2018-08-21 13:39:48 +02:00
Marcus Holl
6c6f106f26 Avoid several sh calls for consecutive git calls. 2018-08-21 13:39:48 +02:00
Marcus Holl
0cb16d43ce artifactSetVersion: use gitUtils#insideWorkTree
rather than checking for existing .git folder. An existing .git folder is a necessarry, but not a sufficient
condition here.

Adapting the test is not necessary. The gitUtil itself is not mocked, but the underlying sh calls are
already mocked accordingly.
2018-08-21 08:23:05 +02:00
Marcus Holl
d1b7c8092f
Merge pull request #258 from marcusholl/pr/neoDeployMtaFromCPE
neoDeploy with archvive from CPE
2018-08-20 13:40:03 +02:00
Marcus Holl
3a72d16185 neoDeploy with archvive from CPE 2018-08-17 15:46:46 +02:00
Ramachandra Kamath Arbettu
2716054392 Make gitSshUrl non-mandatory (#246)
* Update artifactSetVersion.groovy

* Update artifactSetVersion.groovy

* Update artifactSetVersion.groovy

* fix build

* Avoid updating configuration map outside configuration helper
2018-08-16 09:43:32 +02:00
Christopher Fenner
7ab2c3ee22
Create PULL_REQUEST_TEMPLATE.md (#251)
* Create PULL_REQUEST_TEMPLATE.md

* Rename CONTRIBUTING.md to .github/CONTRIBUTING.md

* Update PULL_REQUEST_TEMPLATE.md
2018-08-15 12:00:32 +02:00
Christopher Fenner
6007f54074
use new config handler in steps (#253)
* use new config handler

* use new config handler

* add reporting

* Update checksPublishResults.groovy

* remove unused ConfigurationMerger methods

* fix typo

* revert changes on script loading

* remove outdated test case

* Add missing import
2018-08-15 11:53:28 +02:00