From c6ebe6a5cf46cb435bb9dc97baaf07480925ce81 Mon Sep 17 00:00:00 2001
From: Luiz Carvalho <lucarval@redhat.com>
Date: Feb 12 2019 16:53:22 +0000
Subject: [PATCH 1/2] Revert "ci: Extract appversion from waiverdb-common"


This reverts commit bad16ad5dc5b35cf8edfae4de6f4ac19b14f1e46.

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 2fda4be..c17452a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -137,7 +137,7 @@ node('docker') {
         def waiverdb_common = findFiles(glob: 'mock-result/f28/**/waiverdb-common-*.noarch.rpm')[0]
         def appversion = sh(returnStdout: true, script: """
             rpm2cpio ${f28_rpm} | \
-            cpio --quiet --extract --to-stdout ./usr/lib/python\\*/site-packages/waiverdb-common\\*.egg-info/PKG-INFO | \
+            cpio --quiet --extract --to-stdout ./usr/lib/python\\*/site-packages/waiverdb\\*.egg-info/PKG-INFO | \
             awk '/^Version: / {print \$2}'
         """).trim()
         /* Git builds will have a version like 0.3.2.dev1+git.3abbb08 following

From d4ea9bffd9da52efbef147b0e2d42cc726c1d7c6 Mon Sep 17 00:00:00 2001
From: Luiz Carvalho <lucarval@redhat.com>
Date: Feb 12 2019 16:57:40 +0000
Subject: [PATCH 2/2] ci: Use waiverdb-common to get appversion


Signed-off-by: Luiz Carvalho <lucarval@redhat.com>

---

diff --git a/Jenkinsfile b/Jenkinsfile
index c17452a..e49a06d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -136,7 +136,7 @@ node('docker') {
         /* XXX: remove this once we divorce waiverdb-cli from waiverdb. */
         def waiverdb_common = findFiles(glob: 'mock-result/f28/**/waiverdb-common-*.noarch.rpm')[0]
         def appversion = sh(returnStdout: true, script: """
-            rpm2cpio ${f28_rpm} | \
+            rpm2cpio ${waiverdb_common } | \
             cpio --quiet --extract --to-stdout ./usr/lib/python\\*/site-packages/waiverdb\\*.egg-info/PKG-INFO | \
             awk '/^Version: / {print \$2}'
         """).trim()