Skip to content
This repository has been archived by the owner on May 24, 2023. It is now read-only.

Commit

Permalink
Remove rpm operator-courier dependency and install it from pypi instead
Browse files Browse the repository at this point in the history
When there is a new version of courier, the OCP Group F team has to
release it to PyPI, and then we pull it down and build a fedora rawhide
rpm out of it, and then we build a fedora 30+ rpm out of it and create
a bodhi update for that. Then, we wait ~24 hours for it to land in the
testing repo, so that we can build our container image and start
testing OMPS with the new version. This is a silly delay.
  • Loading branch information
midnightercz committed Aug 17, 2020
1 parent 4e54494 commit 6ce2fc9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@ RUN dnf -y install \
python3-jsonschema \
python3-koji \
python3-requests \
python3-operator-courier \
python3-ruamel-yaml \
python3-pip \
&& dnf -y clean all \
&& rm -rf /tmp/*

RUN dnf --enablerepo=updates-testing -y update python3-operator-courier \
&& dnf -y clean all \
&& rm -rf /tmp/*

RUN if [ "$cacert_url" != "undefined" ]; then \
cd /etc/pki/ca-trust/source/anchors \
&& curl -O $cacert_url \
Expand All @@ -37,6 +32,7 @@ RUN if [ "$cacert_url" != "undefined" ]; then \
# This will allow a non-root user to install a custom root CA at run-time
RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt
COPY . .
RUN pip3 install -r requirements-operator-courier.txt
RUN pip3 install . --no-deps
USER 1001
EXPOSE 8080
Expand Down
2 changes: 1 addition & 1 deletion example.test.env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ alter_package_name:
# NVR
greenwave:
decision_url: https://greenwave.fedoraproject.org/api/v1.0/decision
decision_context: omps_push
decision_context: test_omps_push
product_version: cvp
4 changes: 4 additions & 0 deletions requirements-operator-courier.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
operator-courier == 2.1.8 --hash=sha256:b5482baeff662c1bcba5ec0a97e2f21132ee7a155580ab0ac3b886e1affd8396
PyYAML == 5.3.1 --hash=sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
validators == 0.17.1 --hash=sha256:898b6b8197fbc320daf25d3b32fa928fd25e225c33790cb58ed54b48aebe1858
semver==2.10.2 --hash=sha256:21e80ca738975ed513cba859db0a0d2faca2380aef1962f48272ebf9a8a44bd4

0 comments on commit 6ce2fc9

Please sign in to comment.