From c441608bcec9764d392398d0b268147e53d60f79 Mon Sep 17 00:00:00 2001 From: Adriano Petrich Date: Fri, 24 Apr 2015 15:35:58 +0100 Subject: [PATCH] Changing the way jenkins is being called The old was to install oscplugin and then uninstall to test and delete the requirements.txt, that causes problems when requeriments change. This changes it so we install the lib dependencies needed and let tox work as it was planned and install what it needs before running. Change-Id: I42c3e75e7056fba716195a1f95ef3c59c0ca47bf --- jenkins-config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jenkins-config.yml b/jenkins-config.yml index fb323dc87..3e62be6b8 100644 --- a/jenkins-config.yml +++ b/jenkins-config.yml @@ -44,11 +44,14 @@ product: repo_type: poodle version: 6.0 config: - enable_epel: n + enable_epel: y + rpmrepo: + RedHat: http://rhos-release.virt.bos.redhat.com/repos/rhos-release/ + python_rdomanager_oscplugin_rpm_deps: [ gcc, git, python-sphinx, python-tox, python-pip, - python-rdomanager-oscplugin + libxml2-devel, libxslt-devel, libffi-devel, openssl-devel, ] rdomanager_oscplugin_virt_config: @@ -62,8 +65,6 @@ rdomanager_oscplugin_virt_config: export NOSE_HTML_OUT_FILE=../logs/nose_results.html; export NSS_HASH_ALG_SUPPORT=+MD5; export OPENSSL_ENABLE_MD5_VERIFY=1; - sudo yum remove -y python-rdomanager-oscplugin; - truncate --size 0 requirements.txt; rpm -qa > all-rpms.txt; set -o pipefail; tox --sitepackages -v -epy27 2>&1 | tee ../logs/venv-testrun.log;