Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt CI on RHEL-9 branch #3336

Merged
merged 8 commits into from
May 5, 2021
Merged
Prev Previous commit
Next Next commit
Adapt Dockerfiles to RHEL-9 (#infra)
Dockerfiles were from F34. We want to leave them as close as possible but still
we need to change things like base container etc.

Main difference here is that we don't need to have ELN support in RHEL-9 so
remove these parts from Dockerfiles to simplify it.
jkonecny12 committed May 4, 2021
commit ae7ac4cbcd763a10455c9a4aac0b5055f84d7bf2
12 changes: 3 additions & 9 deletions dockerfile/anaconda-ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
ARG image=registry.fedoraproject.org/fedora:rawhide
ARG image=registry-proxy.engineering.redhat.com/rh-osbs/ubi9:latest
FROM ${image}
# FROM starts a new build stage with new ARGs. Put any ARGs after FROM unless required by the FROM itself.
# see https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG git_branch=master
ARG copr_repo=@rhinstaller/Anaconda
ARG git_branch=rhel-9
ARG copr_repo=rhinstaller-group/Anaconda
LABEL [email protected]

# On ELN, BaseOS+AppStream don't have all our build dependencies; this provides the "Everything" compose
COPY ["eln.repo", "/etc/yum.repos.d"]

# Prepare environment and install build dependencies
RUN set -e; \
if grep -q VARIANT.*eln /etc/os-release; then sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/eln.repo; fi; \
dnf update -y; \
dnf install -y \
'dnf-command(copr)' \
curl \
/usr/bin/xargs \
rpm-build \
@@ -32,7 +27,6 @@ RUN set -e; \
policycoreutils \
python3-gobject-base \
python3-pip; \
if ! grep -q VARIANT.*eln /etc/os-release; then dnf copr enable -y ${copr_repo}; dnf copr enable -y @storage/blivet-daily; fi; \
curl -L https://raw.githubusercontent.com/rhinstaller/anaconda/${git_branch}/anaconda.spec.in | sed 's/@PACKAGE_VERSION@/0/; s/@PACKAGE_RELEASE@/0/; s/%{__python3}/python3/' > /tmp/anaconda.spec; \
rpmspec -q --buildrequires /tmp/anaconda.spec | xargs -d '\n' dnf install -y; \
rpmspec -q --requires /tmp/anaconda.spec | grep -v anaconda | xargs -d '\n' dnf install -y; \
10 changes: 0 additions & 10 deletions dockerfile/anaconda-ci/eln.repo

This file was deleted.

12 changes: 3 additions & 9 deletions dockerfile/anaconda-rpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
ARG image=registry.fedoraproject.org/fedora:rawhide
ARG image=registry-proxy.engineering.redhat.com/rh-osbs/ubi9:latest
FROM ${image}
# FROM starts a new build stage with new ARGs. Put any ARGs after FROM unless required by the FROM itself.
# see https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG git_branch=master
ARG copr_repo=@rhinstaller/Anaconda
ARG git_branch=rhel-9
ARG copr_repo=rhinstaller-group/Anaconda
LABEL [email protected]

# On ELN, BaseOS+AppStream don't have all our build dependencies; this provides the "Everything" compose
COPY ["eln.repo", "/etc/yum.repos.d"]

# Prepare environment and install build dependencies
RUN set -e; \
if grep -q VARIANT.*eln /etc/os-release; then sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/eln.repo; fi; \
dnf update -y; \
dnf install -y \
'dnf-command(copr)' \
curl \
python3-pip \
/usr/bin/xargs \
rpm-build; \
if ! grep -q VARIANT.*eln /etc/os-release; then dnf copr enable -y ${copr_repo}; dnf copr enable -y @storage/blivet-daily; fi; \
curl -L https://raw.githubusercontent.com/rhinstaller/anaconda/${git_branch}/anaconda.spec.in | sed 's/@PACKAGE_VERSION@/0/; s/@PACKAGE_RELEASE@/0/; s/%{__python3}/python3/' > /tmp/anaconda.spec; \
rpmspec -q --buildrequires /tmp/anaconda.spec | xargs -d '\n' dnf install -y; \
mkdir /anaconda
10 changes: 0 additions & 10 deletions dockerfile/anaconda-rpm/eln.repo

This file was deleted.