From c1e2a5b0afd46533d35192ef51c9c0667bbc8bf1 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Wed, 15 May 2019 14:31:11 -0400
Subject: [PATCH] Unpin the libmodulemd RPMs

---
 Vagrantfile                  | 10 +---------
 docker/Dockerfile-tests      |  6 +-----
 docker/Dockerfile-tests-py3  |  5 +----
 openshift/backend/Dockerfile | 13 ++++---------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 94611942..af72177e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,6 @@ $script = <<SCRIPT
     grep -q '^127\.0\.0\.1 fedmsg-relay$' /etc/hosts || echo "127.0.0.1 fedmsg-relay" >> /etc/hosts
     echo "export MODULE_BUILD_SERVICE_DEVELOPER_ENV=1" > /etc/profile.d/module_build_service_developer_env.sh
     source /etc/profile.d/module_build_service_developer_env.sh
-    # Unpin the libmodulemd RPMs and replace with `python2-libmodulemd` after FEDORA-2019-b1cdf17e35
     dnf install -y \
         fedmsg-hub \
         fedmsg-relay \
@@ -25,10 +24,7 @@ $script = <<SCRIPT
         python2-dnf \
         python-docutils \
         python-flask \
-        python-gobject-base \
-        https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python2-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-        https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-        https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm \
+        python2-libmodulemd \
         python-m2ext \
         python-mock \
         python-qpid \
@@ -46,10 +42,6 @@ $script = <<SCRIPT
         rpm-build \
         swig \
         sqlite \
-        glib2-devel \
-        cairo-devel \
-        cairo-gobject-devel \
-        gobject-introspection-devel \
         bash-completion \
         wget \
         which
diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests
index 3c310c40..fdeb4d5c 100644
--- a/docker/Dockerfile-tests
+++ b/docker/Dockerfile-tests
@@ -4,8 +4,6 @@ WORKDIR /build
 RUN yum -y update
 RUN yum -y install epel-release yum-utils
 RUN yum-config-manager --add-repo https://kojipkgs.fedoraproject.org/repos-dist/epel7Server-infra/latest/x86_64/
-# Unpin the libmodulemd RPMs and replace with `python2-libmodulemd` after 2.4.0 is in
-# epel7Server-infra
 RUN yum -y install \
     --nogpgcheck \
     --setopt=deltarpm=0 \
@@ -30,9 +28,7 @@ RUN yum -y install \
     python-futures \
     python-koji \
     python-ldap3 \
-    https://kojipkgs.fedoraproject.org/work/tasks/3269/34833269/libmodulemd-2.4.0-1.el7.infra.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org/work/tasks/3269/34833269/python2-libmodulemd-2.4.0-1.el7.infra.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org/work/tasks/5596/34835596/libmodulemd1-1.8.10-1.el7.infra.x86_64.rpm \
+    python2-libmodulemd \
     python-mock \
     python-munch \
     python-pip \
diff --git a/docker/Dockerfile-tests-py3 b/docker/Dockerfile-tests-py3
index 792eaf0e..c2db2db4 100644
--- a/docker/Dockerfile-tests-py3
+++ b/docker/Dockerfile-tests-py3
@@ -1,7 +1,6 @@
 FROM fedora:29
 
 WORKDIR /build
-# Unpin the libmodulemd RPMs and replace with `python3-libmodulemd` after FEDORA-2019-b1cdf17e35
 RUN dnf -y install \
     --nogpgcheck \
     --setopt=deltarpm=0 \
@@ -20,9 +19,7 @@ RUN dnf -y install \
     python3-flask-sqlalchemy \
     python3-koji \
     python3-ldap3 \
-    https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python3-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm \
+    python3-libmodulemd \
     python3-munch \
     python3-pip \
     python3-prometheus_client \
diff --git a/openshift/backend/Dockerfile b/openshift/backend/Dockerfile
index edff4887..3b9f4b32 100644
--- a/openshift/backend/Dockerfile
+++ b/openshift/backend/Dockerfile
@@ -10,13 +10,10 @@ ARG DNF_CMD="dnf -y --setopt=deltarpm=0 --setopt=install_weak_deps=false --setop
 COPY . /src
 WORKDIR /src
 
-# Unpin the libmodulemd RPMs once MBS is released with libmodulemd v2
+# TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2
 RUN ${DNF_CMD} install \
       'dnf-command(builddep)' rpm-build rpmdevtools rpmlint \
-      python3-tox python3-pytest python3-mock python3-flake8 bandit \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python3-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm && \
+      python3-tox python3-pytest python3-mock python3-flake8 bandit python3-libmodulemd && \
     ${DNF_CMD} builddep *.spec && \
     ${DNF_CMD} clean all
 RUN rpmdev-setuptree && \
@@ -46,15 +43,13 @@ LABEL \
 COPY --from=builder /srv/RPMS /srv/RPMS
 COPY repos/ /etc/yum.repos.d/
 
-# Unpin the libmodulemd RPMs once MBS is released with libmodulemd v2
+# TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2
 RUN $DNF_CMD install \
       python3-psycopg2 \
       python3-docopt \
       python3-service-identity \
       /srv/*/*/*.rpm \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python3-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
-      https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm \
+      python3-libmodulemd \
       $EXTRA_RPMS && \
     $DNF_CMD clean all && \
     rm -rf /srv/RPMS