Skip to content

Commit 989faa9

Browse files
ZenithalHourlyRateZenithalHourlyRate
committed
remove eol repo
Ref to https://mirrors.tuna.tsinghua.edu.cn/news/remove-eol-repo/
1 parent 80e1221 commit 989faa9

18 files changed

+32
-76
lines changed

‎ELK.sh

-44
This file was deleted.

‎adoptium.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ def delete_old_files(ver: int, alive_files: Set[str]):
119119
check=True)
120120
print("APT finished", flush=True)
121121
# =================== YUM repos ==========================
122-
# "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7-8 Adopitum x86_64,aarch64 "centos@{os_ver}-@{arch}" "$BASE_PATH/rpm"
122+
# "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7 Adopitum x86_64,aarch64 "centos@{os_ver}-@{arch}" "$BASE_PATH/rpm"
123123
sp.run([str(here/"yum-sync.py"),
124124
BASE_URL+'/rpm/centos/@{os_ver}/@{arch}',
125125
"--download-repodata",
126-
'7-8',
126+
'7',
127127
'Adoptium',
128128
'x86_64,aarch64',
129129
"centos@{os_ver}-@{arch}",

‎apt-sync.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
requests.utils.default_user_agent = lambda: APT_SYNC_USER_AGENT
2424

2525
OS_TEMPLATE = {
26-
'ubuntu-lts': ["xenial", "bionic", "focal"],
27-
'debian-current': ["jessie", "stretch", "buster", "bullseye"],
26+
'ubuntu-lts': ["bionic", "focal", "jammy"],
27+
'debian-current': ["buster", "bullseye", "bookworm"],
2828
'debian-latest2': ["buster", "bullseye"],
2929
'debian-latest': ["bullseye"],
3030
}

‎chef.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ YUM_PATH="${BASE_PATH}/yum/stable"
1313
APT_PATH="${BASE_PATH}/apt/stable"
1414
export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1515

16-
"$yum_sync" "${UPSTREAM}/yum/stable/el/@{os_ver}/@{arch}" 6-8 chef x86_64 "stable-el@{os_ver}-@{arch}" "$YUM_PATH"
16+
"$yum_sync" "${UPSTREAM}/yum/stable/el/@{os_ver}/@{arch}" 7 chef x86_64 "stable-el@{os_ver}-@{arch}" "$YUM_PATH"
1717
echo "YUM finished"
1818

19-
"$apt_sync" --delete-dry-run "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH"
19+
"$apt_sync" --delete "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH"
2020
echo "APT finished"
2121

2222
"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm

‎elastic.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://artifacts.elastic.co"}
1111
BASE_PATH="${TUNASYNC_WORKING_DIR%/}"
1212
BASE_URL="${BASE_URL%/}"
1313

14-
ELASTIC_VERSION=("5.x" "6.x" "7.x" "8.x")
14+
ELASTIC_VERSION=("6.x" "7.x" "8.x")
1515

1616
YUM_PATH="${BASE_PATH}/yum"
1717
APT_PATH="${BASE_PATH}/apt"
@@ -20,7 +20,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
2020
# =================== APT repos ===============================
2121

2222
for elsver in "${ELASTIC_VERSION[@]}"; do
23-
"$apt_sync" --delete-dry-run "${BASE_URL}/packages/${elsver}/apt" stable main amd64,i386 "${APT_PATH}/${elsver}"
23+
"$apt_sync" --delete "${BASE_URL}/packages/${elsver}/apt" stable main amd64,i386 "${APT_PATH}/${elsver}"
2424

2525
(cd ${BASE_PATH}/${elsver}; ln -sfn ../apt/${elsver} apt)
2626
done

‎erlang.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ echo "Ubuntu finished"
2121
echo "Debian finished"
2222

2323
# =================== YUM repos ===============================
24-
"$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 6-8 erlang x86_64 "@{os_ver}" "$YUM_PATH"
24+
"$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7 erlang x86_64 "@{os_ver}" "$YUM_PATH"
2525
echo "YUM finished"
2626

2727
"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm

‎gitlab-ce.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ UBUNTU_PATH="${BASE_PATH}/ubuntu/"
1515
DEBIAN_PATH="${BASE_PATH}/debian/"
1616
export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1717

18-
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}/" 6-8 "gitlab" x86_64 "el@{os_ver}" "$YUM_PATH"
18+
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}/" 7 "gitlab" x86_64 "el@{os_ver}" "$YUM_PATH"
1919
echo "YUM finished"
2020

21-
"$apt_sync" --delete-dry-run "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH"
21+
"$apt_sync" --delete "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH"
2222
echo "Ubuntu finished"
23-
"$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH"
23+
"$apt_sync" --delete "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH"
2424
echo "Debian finished"
2525

2626
"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm

‎gitlab-ci-multi-runner.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ YUM_PATH="${BASE_PATH}/yum"
1414
UBUNTU_PATH="${BASE_PATH}/ubuntu/"
1515
DEBIAN_PATH="${BASE_PATH}/debian/"
1616

17-
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 6-7 gitlab-ci-multi-runner x86_64 "el@{os_ver}" "$YUM_PATH"
17+
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 7 gitlab-ci-multi-runner x86_64 "el@{os_ver}" "$YUM_PATH"
1818
echo "YUM finished"
1919

20-
"$apt_sync" --delete-dry-run "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH"
20+
"$apt_sync" --delete "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH"
2121
echo "Ubuntu finished"
22-
"$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH"
22+
"$apt_sync" --delete "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH"
2323
echo "Debian finished"
2424

2525

‎gitlab-runner.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ UBUNTU_PATH="${BASE_PATH}/ubuntu/"
1515
DEBIAN_PATH="${BASE_PATH}/debian/"
1616
export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1717

18-
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 6-8 gitlab-runner x86_64,aarch64 "el@{os_ver}-@{arch}" "$YUM_PATH"
18+
"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 7 gitlab-runner x86_64,aarch64 "el@{os_ver}-@{arch}" "$YUM_PATH"
1919
echo "YUM finished"
2020

2121
"$apt_sync" --delete "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386,arm64 "$UBUNTU_PATH"

‎influxdata.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ echo "Debian finished"
2626

2727

2828
# =================== YUM/DNF repos ==========================
29-
"$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 6-8 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH"
29+
"$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 7 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH"
3030
echo "YUM finished"
3131

3232
"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm

‎llvm-apt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://apt.llvm.org"}
1010

1111
export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1212

13-
for os in "xenial" "bionic" "focal" "stretch" "buster" "bullseye"; do
13+
for os in "bionic" "focal" "jammy" "buster" "bullseye" "bookworm"; do
1414
prefix=llvm-toolchain-$os
1515
"$apt_sync" --delete "$BASE_URL/$os" $prefix,$prefix-9,$prefix-10,$prefix-11,$prefix-12,$prefix-13,$prefix-14 main amd64 "$BASE_PATH/$os"
1616
done

‎mongodb.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ yum_sync="${_here}/yum-sync.py"
88
BASE_PATH="${TUNASYNC_WORKING_DIR}"
99
BASE_URL=${TUNASYNC_UPSTREAM_URL:-"http://repo.mongodb.org"}
1010

11-
MONGO_VERSIONS=("5.0" "4.4" "4.2" "4.0" "3.6")
11+
MONGO_VERSIONS=("5.0" "4.4" "4.2")
1212
STABLE_VERSION="5.0"
1313

1414
YUM_PATH="${BASE_PATH}/yum"
@@ -19,7 +19,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1919

2020
components=$(printf ",%s" "${MONGO_VERSIONS[@]}")
2121
components=${components:1}
22-
"$yum_sync" "${BASE_URL}/yum/redhat/@{os_ver}/mongodb-org/@{comp}/@{arch}/" 6-8 "$components" x86_64 "el@{os_ver}-@{comp}" "$YUM_PATH"
22+
"$yum_sync" "${BASE_URL}/yum/redhat/@{os_ver}/mongodb-org/@{comp}/@{arch}/" 7 "$components" x86_64 "el@{os_ver}-@{comp}" "$YUM_PATH"
2323
pushd "${YUM_PATH}"
2424
for stable in el*-${STABLE_VERSION}; do
2525
# e.g. "el8" -> "el8-4.2"
@@ -29,9 +29,9 @@ popd
2929
echo "YUM finished"
3030

3131
components=$(printf ",@{ubuntu-lts}/mongodb-org/%s" "${MONGO_VERSIONS[@]}")
32-
"$apt_sync" --delete-dry-run "$BASE_URL/apt/ubuntu" "${components:1}" multiverse amd64,i386,arm64 "$UBUNTU_PATH"
32+
"$apt_sync" --delete "$BASE_URL/apt/ubuntu" "${components:1}" multiverse amd64,i386,arm64 "$UBUNTU_PATH"
3333
components=$(printf ",@{debian-current}/mongodb-org/%s" "${MONGO_VERSIONS[@]}")
34-
"$apt_sync" --delete-dry-run "$BASE_URL/apt/debian" "${components:1}" main amd64,i386 "$DEBIAN_PATH"
34+
"$apt_sync" --delete "$BASE_URL/apt/debian" "${components:1}" main amd64,i386 "$DEBIAN_PATH"
3535

3636
for dist in "$BASE_URL"/apt/*/dists/*/mongodb-org/; do
3737
stable=${STABLE_VERSION}

‎mysql.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ if [[ -z ${DRY_RUN:-} ]]; then
3434
fi
3535

3636
# =================== APT repos ===============================
37-
MYSQL_APT_REPOS="mysql-5.6,mysql-5.7,mysql-tools,connector-python-2.1,mysql-8.0"
38-
"$apt_sync" --delete "${BASE_URL}/apt/ubuntu" trusty,@ubuntu-lts $MYSQL_APT_REPOS amd64,i386 "${UBUNTU_PATH}"
37+
MYSQL_APT_REPOS="mysql-5.7,mysql-tools,connector-python-2.1,mysql-8.0"
38+
"$apt_sync" --delete "${BASE_URL}/apt/ubuntu" @ubuntu-lts $MYSQL_APT_REPOS amd64,i386 "${UBUNTU_PATH}"
3939
echo "Ubuntu finished"
4040
"$apt_sync" --delete "${BASE_URL}/apt/debian" @debian-current $MYSQL_APT_REPOS amd64,i386 "${DEBIAN_PATH}"
4141
echo "Debian finished"
4242

4343
# =================== YUM/DNF repos ==========================
44-
COMPONENTS="mysql-connectors-community,mysql-tools-community,mysql-8.0-community,mysql-5.6-community,mysql-5.7-community"
45-
"$yum_sync" "${BASE_URL}/yum/@{comp}/el/@{os_ver}/@{arch}/" 6-8 "$COMPONENTS" x86_64,aarch64 "@{comp}-el@{os_ver}-@{arch}" "$YUM_PATH"
44+
COMPONENTS="mysql-connectors-community,mysql-tools-community,mysql-8.0-community,mysql-5.7-community"
45+
"$yum_sync" "${BASE_URL}/yum/@{comp}/el/@{os_ver}/@{arch}/" 7 "$COMPONENTS" x86_64,aarch64 "@{comp}-el@{os_ver}-@{arch}" "$YUM_PATH"
4646
echo "YUM finished"
4747

4848
"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm

‎openmediavault.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ apt_sync="${_here}/apt-sync.py"
88

99
BASE_PATH="${TUNASYNC_WORKING_DIR}"
1010
BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packages.openmediavault.org/public"}
11-
DISTS=shaitan-proposed,shaitan,arrakis-proposed,arrakis,usul-proposed,usul
12-
EXTRA_DISTS=shaitan-beta,shaitan-testing,shaitan,arrakis-docker,arrakis-plex,arrakis-sync,arrakis-teamviewer,arrakis,usul-beta,usul-extras,usul-testing,usul
11+
DISTS=shaitan-proposed,shaitan,usul-proposed,usul
12+
EXTRA_DISTS=shaitan-beta,shaitan-testing,shaitan,usul-beta,usul-extras,usul-testing,usul
1313
ARCHS=amd64,i386,arm64,armel,armhf
1414
export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1515

‎proxmox.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ APT_PATH="${BASE_PATH}/debian"
1313

1414
# === download deb packages ====
1515

16-
"$apt_sync" --delete-dry-run "${BASE_URL}/debian" @debian-current pve-no-subscription,pvetest amd64 "$APT_PATH"
16+
"$apt_sync" --delete "${BASE_URL}/debian" @debian-current pve-no-subscription,pvetest amd64 "$APT_PATH"
1717
echo "Debian finished"
1818

1919
# === download standalone files ====

‎rudder.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1616

1717
components=$(printf ",%s" "${RUDDER_VERS[@]}")
1818
components=${components:1}
19-
"$yum_sync" "${UPSTREAM}/rpm/@{comp}/RHEL_@{os_ver}/" 6-8 $components x86_64 "rudder@{comp}-RHEL_@{os_ver}" "$YUM_PATH"
19+
"$yum_sync" "${UPSTREAM}/rpm/@{comp}/RHEL_@{os_ver}/" 7 $components x86_64 "rudder@{comp}-RHEL_@{os_ver}" "$YUM_PATH"
2020
echo "YUM finished"
2121

2222
for ver in ${RUDDER_VERS[@]}; do

‎virtualbox.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
1919

2020
# === download rhel packages ====
2121

22-
"$yum_sync" "${BASE_URL}/rpm/el/@{os_ver}/@{arch}" 5-8 VirtualBox x86_64 "el@{os_ver}" "$YUM_PATH"
22+
"$yum_sync" "${BASE_URL}/rpm/el/@{os_ver}/@{arch}" 7 VirtualBox x86_64 "el@{os_ver}" "$YUM_PATH"
2323
echo "YUM finished"
2424

2525
# === download deb packages ====

‎yum-sync.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def main():
144144

145145
parser = argparse.ArgumentParser()
146146
parser.add_argument("base_url", type=str, help="base URL")
147-
parser.add_argument("os_version", type=str, help="e.g. 6-8")
147+
parser.add_argument("os_version", type=str, help="e.g. 7-8")
148148
parser.add_argument("component", type=str, help="e.g. mysql56-community,mysql57-community")
149149
parser.add_argument("arch", type=str, help="e.g. x86_64")
150150
parser.add_argument("repo_name", type=str, help="e.g. @{comp}-el@{os_ver}")

0 commit comments

Comments
 (0)