From c63fcdd3ecb59883af87fa03375454d1819868f1 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Sep 29 2017 05:03:15 +0000
Subject: Jenkinsfile: avoid versions with +


Now that we switched to Fedora 26 as the base for the container, we have
a newer setuptools which produces proper versions with + separator.
Previously the older setuptools in EPEL7 was munging these to - when
building the Python package. But it turns out Docker doesn't like
the + character.

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 9ca2334..d21f9ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -102,6 +102,10 @@ node('docker') {
             cpio --quiet --extract --to-stdout ./usr/lib/python2.7/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
+         * the rules in PEP440. But Docker does not let us have + in the tag
+         * name, so let's munge it here. */
+        appversion = appversion.replace('+', '-')
         docker.withRegistry(
                 'https://docker-registry.engineering.redhat.com/',
                 'docker-registry-factory2-builder-sa-credentials') {