modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-02 20:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unpin the libmodulemd RPMs

Browse Source
This commit is contained in:
mprahl
2019-05-15 14:31:11 -04:00
parent dde4b96baf
commit c1e2a5b0af
4 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Vagrantfile vendored
View File

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

6
docker/Dockerfile-tests
View File

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

5
docker/Dockerfile-tests-py3
View File

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

13
openshift/backend/Dockerfile
View File

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