Skip to content

USHIFT-5391: Add systemd-resolved to bootc source images #4553

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

Merged
merged 1 commit into from
Feb 14, 2025
Merged

USHIFT-5391: Add systemd-resolved to bootc source images #4553

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9
# Print repository configuration contents.
# Install MicroShift and cleanup.
RUN dnf repoinfo --enabled && \
dnf install -y firewalld "microshift-{{ .Env.SOURCE_VERSION }}" "microshift-release-info-{{ .Env.SOURCE_VERSION }}" && \
dnf install -y firewalld systemd-resolved \
"microshift-{{ .Env.SOURCE_VERSION }}" "microshift-release-info-{{ .Env.SOURCE_VERSION }}" && \
systemctl enable microshift && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
Expand Down
3 changes: 2 additions & 1 deletion test/image-blueprints-bootc/layer2-source/group1/rhel95-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-da
# Print repository configuration contents.
# Install MicroShift, test agent and cleanup.
RUN dnf repoinfo --enabled && \
dnf install -y firewalld "microshift-{{ .Env.SOURCE_VERSION }}" "microshift-release-info-{{ .Env.SOURCE_VERSION }}" && \
dnf install -y firewalld systemd-resolved \
"microshift-{{ .Env.SOURCE_VERSION }}" "microshift-release-info-{{ .Env.SOURCE_VERSION }}" && \
systemctl enable microshift microshift-test-agent && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
Expand Down
4 changes: 1 addition & 3 deletions test/image-blueprints-bootc/layer2-source/group2/rhel95-bootc-source-optionals.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-da

# Print repository configuration contents.
# Install MicroShift optional packages and cleanup.
# Make sure that systemd-resolved is installed as it is used in tests.
RUN dnf repoinfo --enabled && \
dnf install -y "microshift-olm-{{ .Env.SOURCE_VERSION }}" \
"microshift-multus-{{ .Env.SOURCE_VERSION }}" \
"microshift-gateway-api-{{ .Env.SOURCE_VERSION }}" \
systemd-resolved && \
"microshift-gateway-api-{{ .Env.SOURCE_VERSION }}" && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all
4 changes: 1 addition & 3 deletions test/image-blueprints-bootc/layer2-source/group3/cos9-bootc-source-optionals.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9

# Print repository configuration contents.
# Install MicroShift optional packages and cleanup.
# Make sure that systemd-resolved is installed as it is used in tests.
RUN dnf repoinfo --enabled && \
dnf install -y "microshift-olm-{{ .Env.SOURCE_VERSION }}" \
"microshift-multus-{{ .Env.SOURCE_VERSION }}" \
"microshift-gateway-api-{{ .Env.SOURCE_VERSION }}" \
systemd-resolved && \
"microshift-gateway-api-{{ .Env.SOURCE_VERSION }}" && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all