Use preconfigured repositories at brew build time

openshift-eng · Nov 27, 2024 · 8089aa3 · 8089aa3
1 parent c08dcd9
commit 8089aa3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 142 deletions.
diff --git a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile
@@ -27,7 +27,8 @@ RUN set -euxo pipefail && \
     /tmp/install_protoc.sh "23.4" && \
     /tmp/install_etcd.sh "3.5.10"
 
-RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build jq" && \
+RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build" && \
+    export ART_DNF_WRAPPER_POLICY=skip && \
     dnf install -y --nobest $INSTALL_PKGS && \
     dnf clean all && \
     touch /os-build-image && \

diff --git a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
diff --git a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile
@@ -27,7 +27,8 @@ RUN set -euxo pipefail && \
     /tmp/install_protoc.sh "23.4" && \
     /tmp/install_etcd.sh "3.5.10"
 
-RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros kernel-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build rpmdevtools selinux-policy-devel jq" && \
+RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros kernel-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build rpmdevtools selinux-policy-devel" && \
+    export ART_DNF_WRAPPER_POLICY=skip && \
     dnf install -y --nobest $INSTALL_PKGS && \
     dnf clean all && \
     touch /os-build-image && \

diff --git a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
diff --git a/images/ci-openshift-build-root-previous.rhel8.yml b/images/ci-openshift-build-root-previous.rhel8.yml
@@ -2,7 +2,7 @@ content:
   # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
   set_build_variables: true
   source:
-    dockerfile: ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
+    dockerfile: ci_images/rhel-8/ci-openshift-build-root/Dockerfile
     git:
       branch:
         target: openshift-{MAJOR}.{MINOR}

diff --git a/images/ci-openshift-build-root-previous.rhel9.yml b/images/ci-openshift-build-root-previous.rhel9.yml
@@ -2,7 +2,7 @@ content:
   # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
   set_build_variables: true
   source:
-    dockerfile: ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
+    dockerfile: ci_images/rhel-9/ci-openshift-build-root/Dockerfile
     git:
       branch:
         target: openshift-{MAJOR}.{MINOR}