jenkins-bot has submitted this change and it was merged.

Change subject: Use tox for integration-jjb-config-test
......................................................................


Use tox for integration-jjb-config-test

The JJB validation jobs was using pip --user which does not play nice
because pip is largely outdated on Precise.

Instead bind the job on labs instance having tox and use the tox venv to
invoke JJB.

Change-Id: I380263312ec6b628f0e70830fd5dd42a072dbd11
---
M integration.yaml
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/integration.yaml b/integration.yaml
index d2a8262..d44e67d 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -56,6 +56,7 @@
 # Job to check JJB config
 - job-template:
     name: 'integration-jjb-config-test'
+    node: hasTox  # bound to labs instances
     defaults: use-remote-zuul  # TODO does not really use it
     concurrent: false  # shared directory :(
     triggers:
@@ -73,10 +74,8 @@
             basedir: config
     builders:
      - shell: |
-        set +e
-        http_proxy=nowhere python setup.py develop --user
-        mkdir output/
-        ~/.local/bin/jenkins-jobs test config/ -o output/
+        mkdir "$WORKSPACE/output/"
+        tox -e venv -- jenkins-jobs test "$WORKSPACE/config/" -o 
"$WORKSPACE/output/"
 
 - project:
     name: 'integration-docroot'

-- 
To view, visit https://gerrit.wikimedia.org/r/119736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I380263312ec6b628f0e70830fd5dd42a072dbd11
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to