You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2019/08/07 13:54:59 UTC

[couchdb] branch jenkins-junit-reports-and-jenkins-env updated: Try a workaround

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-junit-reports-and-jenkins-env by this push:
     new 5223f5e  Try a workaround
5223f5e is described below

commit 5223f5e6531d00eeddc12eab642113d48e2cc1d4
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Aug 7 09:54:50 2019 -0400

    Try a workaround
---
 Jenkinsfile | 4 ++--
 Makefile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a9a88af..1ec5d42 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,8 @@ cd apache-couchdb-*
 make
 cd src/mango
 python3 -m venv .venv
-.venv/bin/pip3 install -r requirements.txt
+cat .venv/bin/pip3
+.venv/bin/python3 -m pip3 install -r requirements.txt
 ../../dev/run -n 1 --admin=testuser:testpass .venv/bin/nosetests
 cd ../../
 make elixir || (build-aux/logfile-uploader.py && false)
@@ -97,7 +98,6 @@ pipeline {
           set
           rm -rf apache-couchdb-*
           ./configure --with-curl
-          make mango-test
           make dist
           chmod -R a+w * .
         '''
diff --git a/Makefile b/Makefile
index f5d15d4..1b95e91 100644
--- a/Makefile
+++ b/Makefile
@@ -370,7 +370,7 @@ build-test:
 mango-test: devclean all
 	@cd src/mango && \
 		python3 -m venv .venv && \
-		.venv/bin/pip3 install -r requirements.txt
+		.venv/bin/python3 -m pip3 install -r requirements.txt
 	@cd src/mango && ../../dev/run -n 1 --admin=testuser:testpass .venv/bin/nosetests
 
 ################################################################################