Merge pull request #8 from prashantsail/psail_cci_py27

python 3.6 for local install for bzt
prashantsail · Jun 12, 2020 · 9ed1aac · 9ed1aac
2 parents c139ae4 + 8241daf
commit 9ed1aac
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -126,9 +126,6 @@ jobs:
       steps:
         - attach-mms-workspace
         - install-mms-server
-        - run:
-            name: Install Taurus
-            command: pip install bzt
         - run:
             name: Start MMS, Execute performance regression testcases, Stop MMS
             command: .circleci/scripts/linux_test_taurus.sh

diff --git a/.circleci/images/Dockerfile.python2.7 b/.circleci/images/Dockerfile.python2.7
@@ -49,4 +49,16 @@ RUN cd /opt \
     && wget --no-check-certificate https://jmeter-plugins.org/get/ -O lib/ext/jmeter-plugins-manager-1.4.jar \
     && wget http://search.maven.org/remotecontent?filepath=kg/apc/cmdrunner/2.2/cmdrunner-2.2.jar -O lib/cmdrunner-2.2.jar \
     && java -cp lib/ext/jmeter-plugins-manager-1.4.jar org.jmeterplugins.repository.PluginManagerCMDInstaller \
-    && bin/PluginsManagerCMD.sh install jpgc-synthesis=2.1,jpgc-filterresults=2.1,jpgc-mergeresults=2.1,jpgc-cmd=2.1,jpgc-perfmon=2.1
+    && bin/PluginsManagerCMD.sh install jpgc-synthesis=2.1,jpgc-filterresults=2.1,jpgc-mergeresults=2.1,jpgc-cmd=2.1,jpgc-perfmon=2.1
+
+# bzt is used for performance regression test suite
+# bzt requires python 3.6 runtime.
+# Install pyenv to manage both python versions (2.7 and 3.6.5)
+# Only the for the performance regression suite, Python 3.6.5 will be local installed using "pyenv local 3.6.5"
+# !! MMS server will continue using Python 2.7 !!
+RUN curl https://pyenv.run | bash \
+    && echo 'export PATH="/root/.pyenv/bin:$PATH"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc \
+    && . ~/.bashrc \
+    && pyenv install 3.6.5
diff --git a/.circleci/scripts/linux_test_taurus.sh b/.circleci/scripts/linux_test_taurus.sh
@@ -7,6 +7,15 @@ sleep 90
 
 cd performance_regression
 
+# Hack to use python 3.6.5 for bzt installation and execution on a Python 2.7 environment
+# ToDo: Update condition to be more specific - check if python 2 is installed by default
+if hash pyenv 2>/dev/null; then
+  pyenv local 3.6.5
+fi
+
+# Install dependencies
+pip install bzt
+
 curl -O https://s3.amazonaws.com/model-server/inputs/kitten.jpg
 bzt -o modules.jmeter.path=/opt/apache-jmeter-5.3/bin/jmeter \
     -o settings.artifacts-dir=/tmp/mms-performance-regression/ \