From a150851cc8e5c37c8d242d3f93f13d95d3eed332 Mon Sep 17 00:00:00 2001 From: Yash Nanavati Date: Mar 05 2018 21:58:08 +0000 Subject: Code for Jenkins to run both py27 and py3 tests --- diff --git a/Jenkinsfile b/Jenkinsfile index e539e5f..5211c83 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 @development python-devel python3 @development python3-devel 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 python3 \'pip install --upgrade pip setuptools tox\'' } stage('Clone Test Suite') { @@ -36,9 +37,10 @@ node('factory2'){ } stage('Run Test Suite') { - timeout(20) { + timeout(50) { // Run tox in the SCL environment onmyduffynode 'cd fm-orchestrator && scl enable python27 \'tox -r\'' + onmyduffynode 'cd fm-orchestrator && scl enable python3 \'tox -r\'' } }