From 0defabc88c56fc380df28a1c2eb7175303f72655 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 23 Mar 2018 11:02:21 -0400 Subject: [PATCH] Transition CentOS CI to using Docker for running its tests --- Jenkinsfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09ed25d2..2de0d0c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,23 +25,20 @@ node('factory2'){ try{ 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 python-devel rh-python36 @development krb5-devel openssl-devel libffi-devel swig createrepo_c cairo-gobject-devel gobject-introspection-devel' - // Remove this once it's available in the official repos - onmyduffynode 'yum -y install https://kojipkgs.fedoraproject.org//packages/libmodulemd/1.0.4/1.fc26/x86_64/libmodulemd-1.0.4-1.fc26.x86_64.rpm' - // 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\'' + onmyduffynode 'yum -y install git docker && systemctl start docker' } stage('Clone Test Suite') { onmyduffynode "git clone -b \"${env.BRANCH_NAME}\" --single-branch --depth 1 https://pagure.io/fm-orchestrator" } + stage('Build Docker Image') { + onmyduffynode 'cd fm-orchestrator && docker build -t mbs/test -f Dockerfile-tests .' + } + stage('Run Test Suite') { timeout(20) { - // Run tox in the SCL environment - onmyduffynode 'cd fm-orchestrator && scl enable rh-python36 \'tox -r\'' + onmyduffynode 'cd fm-orchestrator && docker run mbs/test' } }