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.

Sign up for GitHub

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

Jump to bottom

[DNM] test CI #264

Closed
wants to merge 1 commit into from
Closed

[DNM] test CI #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions Dockerfile.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
# Please ensure this file is kept in sync with Dockerfile.okd

## BUILDER
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.11 AS builder

WORKDIR /tmp

COPY ironic-rpms.repo /etc/yum.repos.d/
RUN ls -la /etc/yum.repos.d/ && dnf repolist && dnf config-manager --set-disabled openstack-16-for-rhel-8-rpms && dnf config-manager --set-enabled rhel-8-server-ironic-rpms && dnf repolist enabled

COPY prepare-efi.sh /bin/
RUN prepare-efi.sh redhat

## IRONIC-IMAGE
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.11

ENV PKGS_LIST=main-packages-list.ocp
ARG EXTRA_PKGS_LIST

COPY ironic-rpms.repo /etc/yum.repos.d/
RUN ls -la /etc/yum.repos.d/ && dnf repolist && dnf config-manager --set-disabled openstack-16-for-rhel-8-rpms && dnf config-manager --set-enabled rhel-8-server-ironic-rpms && dnf repolist enabled

COPY ${PKGS_LIST} ${EXTRA_PKGS_LIST:-$PKGS_LIST} /tmp/
COPY prepare-image.sh prepare-ipxe.sh /bin/

Expand All @@ -21,7 +30,7 @@ RUN prepare-image.sh && \

COPY scripts/* /bin/

# IRONIC #
# IRONIC CONFIG #
COPY --from=builder /tmp/esp.img /tmp/uefi_esp.img

COPY ironic-config/ironic.conf.j2 /etc/ironic/
Expand All @@ -39,6 +48,6 @@ RUN mkdir -p /var/lib/ironic /var/lib/ironic-inspector && \
sqlite3 /var/lib/ironic-inspector/ironic-inspector.db "pragma journal_mode=wal" && \
dnf remove -y sqlite

# IRONIC-INSPECTOR #
# IRONIC-INSPECTOR CONFIG #
COPY ironic-inspector-config/ironic-inspector.conf.j2 /etc/ironic-inspector/
COPY ironic-inspector-config/inspector-apache.conf.j2 /etc/httpd/conf.d/
11 changes: 11 additions & 0 deletions ironic-rpms.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[rhel-8-server-ironic-rpms]
name = rhel-8-server-ironic-rpms
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.11/rhel-8-server-ironic-rpms/
enabled = 1
sslverify = false
username_file=/tmp/mirror-enterprise-basic-auth/username
password_file=/tmp/mirror-enterprise-basic-auth/password
failovermethod = priority
skip_if_unavailable = true
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
1 change: 1 addition & 0 deletions main-packages-list.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ python3-debtcollector >= 2.3.0-0.20211012161119.0bf5bf5.el8
python3-dracclient >= 7.0.0-0.20211012182751.d26664e.el8
python3-eventlet >= 0.30.2-1.el8
python3-gunicorn >= 19.9.0-10.el8ost.1
python3-hardware >= 0.29.0-0.20220216015636.7662a1d.el8
python3-ironic-lib >= 5.1.0-0.20211209154936.731e2f9.el8
python3-ironic-prometheus-exporter >= 3.1.0-0.20211130174057.d25ba32.el8
python3-ironicclient >= 4.9.0-0.20211209154934.6f1be06.el8
Expand Down