From 7698deee6e3dcc6e8ea07619486f52f5e11403c2 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Feb 26 2019 14:11:03 +0000
Subject: Use the f29 RPM when build the container image


---

diff --git a/Jenkinsfile b/Jenkinsfile
index e49a06d..f9a65fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,10 +131,10 @@ node('fedora-28') {
 node('docker') {
     checkout scm
     stage('Build Docker container') {
-        unarchive mapping: ['mock-result/f28/': '.']
-        def f28_rpm = findFiles(glob: 'mock-result/f28/**/*.noarch.rpm')[0]
+        unarchive mapping: ['mock-result/f29/': '.']
+        def f29_rpm = findFiles(glob: 'mock-result/f29/**/*.noarch.rpm')[0]
         /* XXX: remove this once we divorce waiverdb-cli from waiverdb. */
-        def waiverdb_common = findFiles(glob: 'mock-result/f28/**/waiverdb-common-*.noarch.rpm')[0]
+        def waiverdb_common = findFiles(glob: 'mock-result/f29/**/waiverdb-common-*.noarch.rpm')[0]
         def appversion = sh(returnStdout: true, script: """
             rpm2cpio ${waiverdb_common } | \
             cpio --quiet --extract --to-stdout ./usr/lib/python\\*/site-packages/waiverdb\\*.egg-info/PKG-INFO | \
@@ -150,7 +150,7 @@ node('docker') {
             /* Note that the docker.build step has some magic to guess the
              * Dockerfile used, which will break if the build directory (here ".")
              * is not the final argument in the string. */
-            def image = docker.build "factory2/waiverdb:internal-${appversion}", "--build-arg waiverdb_rpm=$f28_rpm --build-arg waiverdb_common_rpm=$waiverdb_common --build-arg cacert_url=https://password.corp.redhat.com/RH-IT-Root-CA.crt ."
+            def image = docker.build "factory2/waiverdb:internal-${appversion}", "--build-arg waiverdb_rpm=$f29_rpm --build-arg waiverdb_common_rpm=$waiverdb_common --build-arg cacert_url=https://password.corp.redhat.com/RH-IT-Root-CA.crt ."
             /* Pushes to the internal registry can sometimes randomly fail
              * with "unknown blob" due to a known issue with the registry
              * storage configuration. So we retry up to 3 times. */
@@ -161,7 +161,7 @@ node('docker') {
         docker.withRegistry(
                 'https://quay.io/',
                 'quay-io-factory2-builder-sa-credentials') {
-            def image = docker.build "factory2/waiverdb:${appversion}", "--build-arg waiverdb_rpm=$f28_rpm --build-arg waiverdb_common_rpm=$waiverdb_common ."
+            def image = docker.build "factory2/waiverdb:${appversion}", "--build-arg waiverdb_rpm=$f29_rpm --build-arg waiverdb_common_rpm=$waiverdb_common ."
             image.push()
         }
         /* Save container version for later steps (this is ugly but I can't find anything better...) */