Skip to content

Backport(v6) ci: fixup broken mirrors (#1062,#1064) #1063

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
Watson1978 merged 2 commits into from
Jun 5, 2026
Merged

Backport(v6) ci: fixup broken mirrors (#1062,#1064) #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f92f1
Backport(v6) ci: fixup broken mirrors (#1062)
kenhys Jun 5, 2026
24ae128
ci: ensure ready to use config-manager (#1064)
kenhys Jun 5, 2026
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
50 changes: 50 additions & 0 deletions fluent-package/yum/systemd-test/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,53 @@ function install_aws_cli()
unzip awscliv2.zip
sudo ./aws/install
}

function fixup_broken_mirrors()
{
if [ "$DISTRIBUTION" = "amazon" ]; then
return 0
fi

# When mirrorlist in .repo is not accessible temporary,
# CI stops unexpectedly. This is last resort that I hope it will not fire.
if ! sudo $DNF repolist -v; then
# Avoid broken mirrorlist, enable baseurl explicitly
case $DISTRIBUTION_VERSION in
8)
# install missing dnf-config-manager
FALLBACK_URL=https://ftp.iij.ad.jp/pub/linux/rocky
sudo $DNF install -y dnf-plugins-core --setopt=baseos.mirrorlist= \
--setopt=baseos.baseurl=${FALLBACK_URL}/\$releasever/BaseOS/\$basearch/os/

sudo $DNF config-manager --setopt=baseos.mirrorlist= \
--setopt=baseos.baseurl=${FALLBACK_URL}/\$releasever/BaseOS/\$basearch/os/ --save
sudo $DNF config-manager --setopt=appstream.mirrorlist= \
--setopt=appstream.baseurl=${FALLBACK_URL}/\$releasever/AppStream/\$basearch/os/ --save
sudo $DNF config-manager --setopt=extras.mirrorlist= \
--setopt=extras.baseurl=${FALLBACK_URL}/\$releasever/extras/\$basearch/os/ --save
;;
9|10*)
FALLBACK_URL=https://ftp.iij.ad.jp/pub/linux/almalinux
sudo $DNF install -y dnf-plugins-core --setopt=baseos.mirrorlist= \
--setopt=baseos.baseurl=${FALLBACK_URL}/\$releasever/BaseOS/\$basearch/os/

sudo $DNF config-manager --setopt=baseos.mirrorlist= \
--setopt=baseos.baseurl=${FALLBACK_URL}/\$releasever/BaseOS/\$basearch/os/ --save
sudo $DNF config-manager --setopt=appstream.mirrorlist= \
--setopt=appstream.baseurl=${FALLBACK_URL}/\$releasever/AppStream/\$basearch/os/ --save
sudo $DNF config-manager --setopt=extras.mirrorlist= \
--setopt=extras.baseurl=${FALLBACK_URL}/\$releasever/extras/\$basearch/os/ --save
case $DISTRIBUTION_VERSION in
10*)
sudo $DNF config-manager --setopt=crb.mirrorlist= \
--setopt=crb.baseurl=${FALLBACK_URL}/\$releasever/CRB/\$basearch/os/ --save
;;
esac
;;
*)
echo "ERROR: unsupported $DISTRIBUTION $DISTRIBUTION_VERSION"
exit 1
;;
esac
fi
}
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/downgrade-to-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

install_v4
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/downgrade-to-v5-lts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

# Install v5 LTS to register the repository
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

# Display unit info for debug
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/elasticsearch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

GATEWAY=$(ip route | grep default | cut -d' ' -f3)
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/install-newly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

case $1 in
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/obsolete-plugins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

install_current
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/opensearch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

GATEWAY=$(ip route | grep default | cut -d' ' -f3)
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/tmpfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

# Display unit info for debug
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-from-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

testcase=${1:-directly}
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-from-v5-lts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

install_v5_lts
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-major-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

service_restart=$1
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version-service-status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

enabled_before_update=$1 # enabled / disabled
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version-with-auto-and-manual.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

package="/host/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-[0-9]*.rpm"
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

install_v4
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

# Install the current
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/yum/systemd-test/update-without-data-lost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -exu
if [ "$distribution" = "amazon" ]; then
sudo $DNF repolist -v
sudo $DNF --releasever=latest update -y
else
fixup_broken_mirrors
fi

v6_package="/host/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm"
Expand Down
Loading