laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/42899?usp=email ) Change subject: jobs/{master,gerrit}: eim,ipa: wipe-workspace ...................................................................... jobs/{master,gerrit}: eim,ipa: wipe-workspace Set wipe-workspace for the onomondo-eim and onomondo-ipa jobs to true, so previous failures cannot influence new jenkins job runs. E.g. currently we had gerrit-onomondo-ipa-build failing with: + mkdir build mkdir: cannot create directory 'build': File exists Most existing jobs call scripts/osmo-clean-workspace.sh from osmo-ci.git at the beginning of their jenkins.sh instead of using wipe-workspace. But this doesn't have any advantage here while making jenkins.sh more complex. Let's use the built-in feature from jenkins here. Change-Id: If4ef5ab804b05ad630cfa770741fe6053fdfb637 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 10 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a75d6be..9d40493 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -44,6 +44,7 @@ a4: !!python/tuple [default] combination_filter: '' sequential: false + wipe: false # most projects use osmo-clean-workspace.sh instead # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) # seccomp profile is needed for io_uring (OS#6405) @@ -196,9 +197,11 @@ - onomondo-eim: cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: "" + wipe: true - onomondo-ipa: pipeline_binpkgs: "" + wipe: true - openggsn: a1_name: GTP @@ -863,7 +866,7 @@ refspec: $GERRIT_REFSPEC name: choosing-strategy: gerrit - wipe-workspace: false + wipe-workspace: '{obj:wipe}' skip-tag: true submodule: recursive: true diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1900ffe..b59a923 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -17,6 +17,7 @@ a4: !!python/tuple [default] combination_filter: '' sequential: false + wipe: false # most projects use osmo-clean-workspace.sh instead # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) # seccomp profile is needed for io_uring (OS#6405) @@ -279,8 +280,11 @@ - onomondo-eim: cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + wipe: true - - onomondo-ipa + - onomondo-ipa: + wipe: true + - osmo-bsc - osmo-bsc-nat @@ -746,7 +750,7 @@ - '$BRANCH' refspec: name: - wipe-workspace: false + wipe-workspace: '{obj:wipe}' skip-tag: true submodule: recursive: true -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ef5ab804b05ad630cfa770741fe6053fdfb637 Gerrit-Change-Number: 42899 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org>