From 7c49dd09b4fe2ddd43e999526600443f9649fdb6 Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 16:15:34 +0000 Subject: [PATCH 1/3] Use Fedora 28 Jenkins slaves since the job will fail on Fedora 27 slaves --- diff --git a/Jenkinsfile b/Jenkinsfile index ad01e8e..b5175d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,7 @@ node('master'){ timestamps { -node('fedora') { +node('fedora-28') { checkout scm stage('Prepare') { sh 'sudo dnf -y builddep waiverdb.spec' @@ -169,7 +169,7 @@ node('docker') { archiveArtifacts artifacts: 'appversion' } } -node('fedora') { +node('fedora-28') { sh 'sudo dnf -y install /usr/bin/py.test-3' checkout scm stage('Perform functional tests') { From ecc89652f605b9a2389f7354853e755c840a3b6c Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 16:16:47 +0000 Subject: [PATCH 2/3] Stop building Fedora 27 RPMs in Jenkins since it is EOL --- diff --git a/Jenkinsfile b/Jenkinsfile index b5175d1..92e52c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,14 +96,6 @@ node('fedora-28') { """ archiveArtifacts artifacts: 'mock-result/el7/**' }, - 'F27': { - sh """ - mkdir -p mock-result/f27 - flock /etc/mock/fedora-27-x86_64.cfg \ - /usr/bin/mock -v --resultdir=mock-result/f27 -r fedora-27-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm - """ - archiveArtifacts artifacts: 'mock-result/f27/**' - }, 'F28': { sh """ mkdir -p mock-result/f28 @@ -119,9 +111,6 @@ node('fedora-28') { 'EPEL7': { sh 'rpmlint -f rpmlint-config.py mock-result/el7/*.rpm' }, - 'F27': { - sh 'rpmlint -f rpmlint-config.py mock-result/f27/*.rpm' - }, 'F28': { sh 'rpmlint -f rpmlint-config.py mock-result/f28/*.rpm' }, From 53f79737a3618b9de49294df7d498cf1606f5dde Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 16:18:13 +0000 Subject: [PATCH 3/3] Build Fedora 29 RPMs in Jenkins --- diff --git a/Jenkinsfile b/Jenkinsfile index 92e52c6..c17452a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,6 +104,14 @@ node('fedora-28') { """ archiveArtifacts artifacts: 'mock-result/f28/**' }, + 'F29': { + sh """ + mkdir -p mock-result/f29 + flock /etc/mock/fedora-29-x86_64.cfg \ + /usr/bin/mock -v --resultdir=mock-result/f29 -r fedora-29-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm + """ + archiveArtifacts artifacts: 'mock-result/f29/**' + }, ) } stage('Invoke Rpmlint') { @@ -114,6 +122,9 @@ node('fedora-28') { 'F28': { sh 'rpmlint -f rpmlint-config.py mock-result/f28/*.rpm' }, + 'F29': { + sh 'rpmlint -f rpmlint-config.py mock-result/f29/*.rpm' + }, ) } }