| |
@@ -30,7 +30,8 @@
|
| |
EOF
|
| |
}
|
| |
|
| |
- ARCHES=("aarch64" "armhfp" "ppc64le" "s390x" "x86_64")
|
| |
+ # Make sure we use GOARCH values - https://bugzilla.redhat.com/show_bug.cgi?id=1997789
|
| |
+ ARCHES=("aarch64" "arm" "ppc64le" "s390x" "amd64")
|
| |
# This is the release of Fedora that is currently stable, it will define if we
|
| |
# need to move the fedora:latest tag
|
| |
current_stable="34"
|
| |
@@ -75,17 +76,18 @@
|
| |
# Import the image
|
| |
for arch in "${ARCHES[@]}"
|
| |
do
|
| |
- xz -d ${build_name}.${arch}.tar.xz
|
| |
+ koji_arch=$(echo ${arch} | sed -e "s/arm/armhfp/g"| sed -e "s/amd64/x86_64/g")
|
| |
+ xz -d ${build_name}.${koji_arch}.tar.xz
|
| |
# If ${stage} is a non-zero length string, then perform staging
|
| |
if [[ -z "$stage" ]]; then
|
| |
registries=("registry.fedoraproject.org" "candidate-registry.fedoraproject.org" "quay.io/fedora")
|
| |
- skopeo copy docker-archive:${build_name}.${arch}.tar docker://registry.fedoraproject.org/fedora:${1}-${arch}
|
| |
- skopeo copy docker-archive:${build_name}.${arch}.tar docker://candidate-registry.fedoraproject.org/fedora:${1}-${arch}
|
| |
- skopeo copy docker-archive:${build_name}.${arch}.tar docker://quay.io/fedora/fedora:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${build_name}.${koji_arch}.tar docker://registry.fedoraproject.org/fedora:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${build_name}.${koji_arch}.tar docker://candidate-registry.fedoraproject.org/fedora:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${build_name}.${koji_arch}.tar docker://quay.io/fedora/fedora:${1}-${arch}
|
| |
else
|
| |
registries=("registry.stg.fedoraproject.org" "candidate-registry.stg.fedoraproject.org")
|
| |
- skopeo copy docker-archive:${build_name}.${arch}.tar docker://registry.stg.fedoraproject.org/fedora:${1}-${arch}
|
| |
- skopeo copy docker-archive:${build_name}.${arch}.tar docker://candidate-registry.stg.fedoraproject.org/fedora:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${build_name}.${koji_arch}.tar docker://registry.stg.fedoraproject.org/fedora:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${build_name}.${koji_arch}.tar docker://candidate-registry.stg.fedoraproject.org/fedora:${1}-${arch}
|
| |
fi
|
| |
done
|
| |
|
| |
@@ -117,17 +119,18 @@
|
| |
# Import the image
|
| |
for arch in "${ARCHES[@]}"
|
| |
do
|
| |
- xz -d ${minimal_build_name}.${arch}.tar.xz
|
| |
+ koji_arch=$(echo ${arch} | sed -e "s/arm/armhfp/g"| sed -e "s/amd64/x86_64/g")
|
| |
+ xz -d ${minimal_build_name}.${koji_arch}.tar.xz
|
| |
# If ${stage} is a non-zero length string, then perform staging
|
| |
if [[ -z "$stage" ]]; then
|
| |
registries=("registry.fedoraproject.org" "candidate-registry.fedoraproject.org" "quay.io/fedora")
|
| |
- skopeo copy docker-archive:${minimal_build_name}.${arch}.tar docker://registry.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
- skopeo copy docker-archive:${minimal_build_name}.${arch}.tar docker://candidate-registry.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${minimal_build_name}.${koji_arch}.tar docker://registry.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${minimal_build_name}.${koji_arch}.tar docker://candidate-registry.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
else
|
| |
registries=("registry.stg.fedoraproject.org" "candidate-registry.stg.fedoraproject.org")
|
| |
- skopeo copy docker-archive:${minimal_build_name}.${arch}.tar docker://registry.stg.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
- skopeo copy docker-archive:${minimal_build_name}.${arch}.tar docker://candidate-registry.stg.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
- skopeo copy docker-archive:${minimal_build_name}.${arch}.tar docker://quay.io/fedora/fedora-minimal:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${minimal_build_name}.${koji_arch}.tar docker://registry.stg.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${minimal_build_name}.${koji_arch}.tar docker://candidate-registry.stg.fedoraproject.org/fedora-minimal:${1}-${arch}
|
| |
+ skopeo copy docker-archive:${minimal_build_name}.${koji_arch}.tar docker://quay.io/fedora/fedora-minimal:${1}-${arch}
|
| |
fi
|
| |
done
|
| |
popd &> /dev/null
|
| |
cverna
commented 2 years ago
We need to make sure to use the GOARCH architecture spec
to create the manifest list. The spec differs from koji
architecture for armhfp --> arm and x86_64 --> amd64.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1997789
Signed-off-by: Clement Verna cverna@tutanota.com