Merge remote-tracking branch 'couchbase/trinity' into phoenix

* couchbase/trinity:
  MB-67886: Fix cluster_tests job

Change-Id: I1d8c570f6725f496743b3acfac87752f29f66236

Author: Peter-Searby

cluster_tests/CMakeLists.txt

@@ -1,10 +1,25 @@
+
+# Fetch WORKSPACE from ENV for Jenkins
+SET(WORKSPACE ${CMAKE_CURRENT_BINARY_DIR})
+IF ($ENV{WORKSPACE})
+  SET(WORKSPACE $ENV{WORKSPACE})
+ENDIF ($ENV{WORKSPACE})
+# Fetch WORKSPACE from ENV for Jenkins
+SET(VIRTUALENV_NAME ns_server_cluster_tests})
+IF ($ENV{VIRTUALENV_NAME})
+  SET(VIRTUALENV_NAME $ENV{VIRTUALENV_NAME})
+ENDIF ($ENV{VIRTUALENV_NAME})
+
 ADD_CUSTOM_TARGET(cluster_tests_python_requirements
-        COMMAND ${PYTHON_EXE} -m ensurepip
-        COMMAND ${PYTHON_EXE} -m pip
+        COMMAND python -m venv ${WORKSPACE}/${VIRTUALENV_NAME}
+        COMMAND source ${WORKSPACE}/${VIRTUALENV_NAME}/bin/activate
+        COMMAND python -m pip install --upgrade pip
+        COMMAND python -m pip
         install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt)
 SEPARATE_ARGUMENTS(cluster_test_args NATIVE_COMMAND $ENV{CLUSTER_TESTS_ARGS})
 ADD_CUSTOM_TARGET(cluster_tests
-        COMMAND JAVA_HOME=${Java_JAVA_HOME} ${PYTHON_EXE}
+        COMMAND source ${WORKSPACE}/${VIRTUALENV_NAME}/bin/activate
+        COMMAND JAVA_HOME=${Java_JAVA_HOME} python
         ${CMAKE_CURRENT_SOURCE_DIR}/run.py ${cluster_test_args}
         DEPENDS cluster_tests_python_requirements
         COMMAND_EXPAND_LISTS)