diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-27 22:40:30 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-27 22:41:57 +0200 |
| commit | 229fa070c49cb78c10dfda9e813b3702d9bf6e47 (patch) | |
| tree | 0d53dddfa5f7607d3064ce7ae6c1a07a9a221d5b /contrib | |
| parent | faee5dead683b87102240e8a4ff1f1a053869aeb (diff) | |
jenkins: use osmo-clean-workspace.sh before and after build
See osmo-ci change I2409b2928b4d7ebbd6c005097d4ad7337307dd93 for rationale.
Depends: I2409b2928b4d7ebbd6c005097d4ad7337307dd93
Change-Id: I99fdd20e7b18c2f4a59a9db35e5efccca6546b77
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/jenkins-arm.sh | 2 | ||||
| -rwxr-xr-x | contrib/jenkins.sh | 2 | ||||
| -rw-r--r-- | contrib/jenkins_common.sh | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/contrib/jenkins-arm.sh b/contrib/jenkins-arm.sh index ef116b12..acdbe3cc 100755 --- a/contrib/jenkins-arm.sh +++ b/contrib/jenkins-arm.sh @@ -24,3 +24,5 @@ build() { build builddir # verify build in source tree build . + +osmo-clean-workspace.sh diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d7315040..5798c950 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,3 +29,5 @@ build . # is well separated from the source tree state. $MAKE distcheck \ || cat-testlogs.sh + +osmo-clean-workspace.sh diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index bc4ac65b..a6ffe7f7 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -8,6 +8,8 @@ if [ -z "$MAKE" ]; then exit 1 fi +osmo-clean-workspace.sh + verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") prep_build() { @@ -16,11 +18,8 @@ prep_build() { cd "$_src_dir" - # a failed 'make distcheck' may leave files without write permissions - chmod -R a+w . - git clean -dxf - # make absolutely sure no src files have modifications - git checkout -f HEAD + # clean again before each build variant + osmo-clean-workspace.sh autoreconf --install --force |