#1257 Unpin the libmodulemd RPMs
Merged a month ago by mprahl. Opened a month ago by mprahl.

file modified
+1 -9

@@ -6,7 +6,6 @@ 

      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 @@ 

          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 @@ 

          rpm-build \

          swig \

          sqlite \

-         glib2-devel \

-         cairo-devel \

-         cairo-gobject-devel \

-         gobject-introspection-devel \

          bash-completion \

          wget \

          which

file modified
+1 -5

@@ -4,8 +4,6 @@ 

  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 @@ 

      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 \

file modified
+1 -4

@@ -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 @@ 

      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 \

file modified
+4 -9

@@ -10,13 +10,10 @@ 

  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 @@ 

  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

no initial comment

Build 22b11a59625c14062d600ffa0d02e6066b7fa43f FAILED!
Rebase or make new commits to rebuild.

Build 22b11a59625c14062d600ffa0d02e6066b7fa43f FAILED!
Rebase or make new commits to rebuild.

rebased onto 23120888cc49a96c77ee2e39e4ce05eb2bdb9a53

a month ago

rebased onto c1e2a5b

a month ago

Pull-Request has been merged by mprahl

a month ago