From 9b1a8cf4f02fc589b987406fb0bb63f4e6a8978e Mon Sep 17 00:00:00 2001 From: Yash Nanavati Date: Mon, 5 Mar 2018 16:58:08 -0500 Subject: [PATCH] Code for Jenkins to run both py27 and py3 tests --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e539e5f8..3aef5503 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,9 +26,10 @@ node('factory2'){ stage('Pre Setup Node'){ // Install EPEL and the SCLs repo onmyduffynode 'yum -y install epel-release yum-config-manager centos-release-scl && yum-config-manager --enable rhel-server-rhscl-7-rpms' - onmyduffynode 'yum -y install python27 @development python-devel krb5-devel openssl-devel libffi-devel swig createrepo_c' + onmyduffynode 'yum -y install python27 python-devel rh-python36 @development krb5-devel openssl-devel libffi-devel swig createrepo_c' // Update pip and setuptools and install tox in the SCL environment onmyduffynode 'scl enable python27 \'pip install --upgrade pip setuptools tox\'' + onmyduffynode 'scl enable rh-python36 \'pip install --upgrade pip setuptools tox\'' } stage('Clone Test Suite') { @@ -38,7 +39,7 @@ node('factory2'){ stage('Run Test Suite') { timeout(20) { // Run tox in the SCL environment - onmyduffynode 'cd fm-orchestrator && scl enable python27 \'tox -r\'' + onmyduffynode 'cd fm-orchestrator && scl enable rh-python36 \'tox -r\'' } }