Determine CPU architecture with

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
cloud-bulldozer · Sep 13, 2021 · a5cdc0f · a5cdc0f
1 parent 8b69368
commit a5cdc0f
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 29 deletions.
diff --git a/snafu/benchmarks/uperf/Dockerfile.ppc64le b/snafu/benchmarks/uperf/Dockerfile.ppc64le
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi8:latest
 
 RUN dnf install -y --nodocs git python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran  && dnf clean all
-COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
+COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
 RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
 RUN dnf install -y --nodocs hostname procps-ng iproute net-tools ethtool nmap iputils https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf clean all
 RUN dnf install -y uperf && dnf clean all

diff --git a/snafu/fio_wrapper/Dockerfile.ppc64le b/snafu/fio_wrapper/Dockerfile.ppc64le
@@ -1,5 +1,5 @@
 FROM registry.access.redhat.com/ubi8:latest as builder
-COPY snafu/image_resources/ppc64le/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY snafu/image_resources/centos8.repo /etc/yum.repos.d/centos8.repo
 RUN dnf install -y --enablerepo=centos8 make gcc libaio zlib-devel libaio-devel
 RUN curl -L https://github.com/axboe/fio/archive/fio-3.27.tar.gz | tar xzf -
 RUN pushd fio-fio-3.27 && ./configure --disable-native && make -j2

diff --git a/snafu/image_resources/centos8-appstream.repo b/snafu/image_resources/centos8-appstream.repo
@@ -1,17 +1,5 @@
 [centos8-appstream]
 name=CentOS-8-Appstream
-baseurl=http://mirror.centos.org/centos/8/AppStream/x86_64/os/
-enabled=0
-gpgcheck=0
-
-[centos8-appstream-aarch64]
-name=CentOS-8-Appstream-aarch64
-baseurl=http://mirror.centos.org/centos/8/AppStream/aarch64/os/
-enabled=0
-gpgcheck=0
-
-[centos8-appstream-ppc64le]
-name=CentOS-8-Appstream-ppc64le
-baseurl=http://mirror.centos.org/centos/8/AppStream/ppc64le//os/
+baseurl=http://mirror.centos.org/centos/$basearch/AppStream/x86_64/os/
 enabled=0
 gpgcheck=0
diff --git a/snafu/image_resources/centos8.repo b/snafu/image_resources/centos8.repo
@@ -1,5 +1,5 @@
 [centos8]
 name=CentOS-8
-baseurl=http://mirror.centos.org/centos/8/BaseOS/x86_64/os/
+baseurl=http://mirror.centos.org/centos/8/BaseOS/$basearch/os/
 enabled=0
 gpgcheck=0
diff --git a/snafu/image_resources/ppc64le/centos8-appstream.repo b/snafu/image_resources/ppc64le/centos8-appstream.repo
diff --git a/snafu/image_resources/ppc64le/centos8.repo b/snafu/image_resources/ppc64le/centos8.repo
diff --git a/snafu/iperf/Dockerfile.ppc64le b/snafu/iperf/Dockerfile.ppc64le
@@ -1,5 +1,5 @@
 FROM registry.access.redhat.com/ubi8:latest
 
-COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
+COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
 RUN dnf install -y --nodocs iperf3 --enablerepo=centos8-appstream
 RUN dnf install -y --nodocs procps-ng iproute net-tools ethtool nmap iputils
diff --git a/snafu/scale_openshift_wrapper/Dockerfile.ppc64le b/snafu/scale_openshift_wrapper/Dockerfile.ppc64le
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8:latest
 
-COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
+COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
 RUN dnf install -y --nodocs python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran && dnf clean all
 RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
 RUN curl -L https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz -C /usr/bin/ oc

diff --git a/snafu/upgrade_openshift_wrapper/Dockerfile.ppc64le b/snafu/upgrade_openshift_wrapper/Dockerfile.ppc64le
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8:latest
 
-COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
+COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
 RUN dnf install -y --nodocs python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran && dnf clean all
 RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
 RUN curl -L https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz -C /usr/bin/ oc