Merge pull request #4553 from ggiguash/fix_systemd_resolved

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

Author: openshift-merge-bot[bot]

test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile

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

test/image-blueprints-bootc/layer2-source/group1/rhel95-bootc-source.containerfile

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

test/image-blueprints-bootc/layer2-source/group2/rhel95-bootc-source-optionals.containerfile

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

test/image-blueprints-bootc/layer2-source/group3/cos9-bootc-source-optionals.containerfile

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