jenkins-bot has submitted this change and it was merged.
Change subject: Make tox shell wrapper a macro
......................................................................
Make tox shell wrapper a macro
No jobs changed.
Change-Id: Ia14e236ea83326d378568ba97e606b924a220179
---
M macro.yaml
M python-jobs.yaml
2 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 56a5a27..4402cde 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -530,6 +530,16 @@
- shell: |
find "$WORKSPACE" -type f -name '*.rb' -print0 | xargs -t -n1 -0
{interpreter} -c
+- builder:
+ name: tox
+ builders:
+ - shell: |
+ rm -fR log
+ mkdir -p log
+ set -o pipefail
+ tox -e "{venv}" | tee "log/{venv}.log"
+ set +o pipefail
+
# Some jobs are not using the git plugin which let us easily wipe
# a current workspace. This macro is meant to replace that feature
# in jobs not using the git plugin.
diff --git a/python-jobs.yaml b/python-jobs.yaml
index bda16af..46ca088 100644
--- a/python-jobs.yaml
+++ b/python-jobs.yaml
@@ -7,12 +7,8 @@
triggers:
- zuul
builders:
- - shell: |
- rm -fR log
- mkdir -p log
- set -o pipefail
- tox -e "{toxenv}" | tee "log/{toxenv}.log"
- set +o pipefail
+ - tox:
+ venv: '{toxenv}'
publishers:
- archive-log-dir
--
To view, visit https://gerrit.wikimedia.org/r/115973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia14e236ea83326d378568ba97e606b924a220179
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
