Skip to content

Commit ba7a018

Browse files
jiefenghuangjiefenghuang
committed
CI: fix the MinIO image address (juicedata#7536)
Signed-off-by: miyang <myang@juicedata.io> (cherry picked from commit 3038748)
1 parent 8ef76b5 commit ba7a018

19 files changed

Lines changed: 39 additions & 21 deletions

‎.github/scripts/cache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ prepare_test()
339339
python3 .github/scripts/flush_meta.py $META_URL
340340
rm -rf /var/jfs/myjfs || true
341341
rm -rf /var/jfsCache/myjfs || true
342-
[[ ! -f /usr/local/bin/mc ]] && wget -q https://dl.minio.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc && chmod +x /usr/local/bin/mc
342+
[[ ! -f /usr/local/bin/mc ]] && .github/scripts/download_mc.sh linux-amd64 /usr/local/bin/mc && chmod +x /usr/local/bin/mc
343343
mc alias set myminio http://localhost:9000 minioadmin minioadmin
344344
mc rm --force --recursive myminio/test || true
345345
}

‎.github/scripts/chaos/minio.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: minio
21-
image: minio/minio
21+
image: quay.io/minio/minio
2222
resources:
2323
limits:
2424
memory: "500Mi"

‎.github/scripts/command-win/gateway.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source .github/scripts/common/common_win.sh
44
[[ -z "$META_URL" ]] && META_URL=redis://127.0.0.1:6379/1
55

66

7-
wget https://dl.min.io/client/mc/release/windows-amd64/archive/mc.RELEASE.2021-04-22T17-40-00Z -O mc.exe
7+
wget https://github.com/minio/mc/releases/download/RELEASE.2021-04-22T17-40-00Z/mc.windows-amd64.RELEASE.2021-04-22T17-40-00Z.exe -O mc.exe
88
chmod +x mc.exe
99
export MINIO_ROOT_USER=admin
1010
export MINIO_ROOT_PASSWORD=admin123

‎.github/scripts/command/Dockerfile.minio-old‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Package the official binary of the original reference server, without rebuilding it.
2+
FROM scratch
3+
ARG TARGETARCH
4+
ADD --chmod=755 https://github.com/minio/minio/releases/download/RELEASE.2021-04-22T15-44-28Z/minio.linux-${TARGETARCH}.RELEASE.2021-04-22T15-44-28Z /minio
5+
ENTRYPOINT ["/minio"]

‎.github/scripts/command/config.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ META_URL=$(get_meta_url $META)
99
if [[ $META_URL == *"?max_open_conns="* ]]; then
1010
META_URL=${META_URL%%\?*}
1111
fi
12-
[ ! -x mc ] && wget -q https://dl.minio.io/client/mc/release/linux-amd64/mc && chmod +x mc
12+
[ ! -x mc ] && .github/scripts/download_mc.sh linux-amd64 ./mc && chmod +x mc
1313

1414
download_juicefs_client(){
1515
version=$1

‎.github/scripts/command/dump_load.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ if ! docker ps | grep -q minio; then
2121
-e "MINIO_SECRET_KEY=minioadmin" \
2222
-v /tmp/data:/data \
2323
-v /tmp/config:/root/.minio \
24-
minio/minio server /data
24+
quay.io/minio/minio server /data
2525
fi
26-
[[ ! -f /usr/local/bin/mc ]] && wget -q https://dl.minio.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc && chmod +x /usr/local/bin/mc
26+
[[ ! -f /usr/local/bin/mc ]] && .github/scripts/download_mc.sh linux-amd64 /usr/local/bin/mc && chmod +x /usr/local/bin/mc
2727
sleep 3s
2828
mc alias set myminio http://localhost:9000 minioadmin minioadmin
2929
python3 -c "import xattr" || sudo pip install xattr

‎.github/scripts/command/gateway-random.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ source .github/scripts/common/common.sh
66
source .github/scripts/start_meta_engine.sh
77
start_meta_engine $META
88
META_URL=$(get_meta_url $META)
9-
[[ ! -x /usr/local/bin/mc ]] && wget -q https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-04-22T17-40-00Z -O /usr/local/bin/mc && sudo chmod +x /usr/local/bin/mc
9+
[[ ! -x /usr/local/bin/mc ]] && wget -q https://github.com/minio/mc/releases/download/RELEASE.2021-04-22T17-40-00Z/mc.linux-amd64.RELEASE.2021-04-22T17-40-00Z -O /usr/local/bin/mc && sudo chmod +x /usr/local/bin/mc
1010
# docker ps -aq --filter "status=exited" --filter "name=minio_old" | xargs -r docker rm -v
1111
if ! docker ps --filter "name=minio_old$" | grep minio_old; then
1212
echo start minio_old
13-
docker run -d -p 9000:9000 --name minio_old -e "MINIO_ACCESS_KEY=minioadmin" -e "MINIO_SECRET_KEY=minioadmin" minio/minio:RELEASE.2021-04-22T15-44-28Z server /tmp/minio_old
13+
docker build -t juicefs/minio-test:RELEASE.2021-04-22T15-44-28Z -f .github/scripts/command/Dockerfile.minio-old .
14+
docker run -d -p 9000:9000 --name minio_old -e "MINIO_ACCESS_KEY=minioadmin" -e "MINIO_SECRET_KEY=minioadmin" juicefs/minio-test:RELEASE.2021-04-22T15-44-28Z server /tmp/minio_old
1415
while ! curl -s http://localhost:9000/minio/health/live > /dev/null; do
1516
echo "Waiting for MinIO to be ready..."
1617
sleep 1

‎.github/scripts/command/gateway.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source .github/scripts/common/common.sh
55
source .github/scripts/start_meta_engine.sh
66
start_meta_engine $META
77
META_URL=$(get_meta_url $META)
8-
wget https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-04-22T17-40-00Z -O mc
8+
wget https://github.com/minio/mc/releases/download/RELEASE.2021-04-22T17-40-00Z/mc.linux-amd64.RELEASE.2021-04-22T17-40-00Z -O mc
99
chmod +x mc
1010
export MINIO_ROOT_USER=admin
1111
export MINIO_ROOT_PASSWORD=admin123

‎.github/scripts/download_mc.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash -e
2+
3+
# Release assets include the version in their names; resolve latest at download time.
4+
platform=$1
5+
dest=$2
6+
release_url=$(curl -fsSLI -o /dev/null -w '%{url_effective}' https://github.com/minio/mc/releases/latest)
7+
version=${release_url##*/}
8+
if [[ "$version" != RELEASE.* ]]; then
9+
echo "Unable to resolve the latest mc release: $release_url" >&2
10+
exit 1
11+
fi
12+
curl -fsSL "https://github.com/minio/mc/releases/download/$version/mc.$platform.$version" -o "$dest"

‎.github/scripts/start_meta_engine.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ start_meta_engine(){
173173
-e "MINIO_SECRET_KEY=minioadmin" \
174174
-v /tmp/data:/data \
175175
-v /tmp/config:/root/.minio \
176-
minio/minio server /data
176+
quay.io/minio/minio server /data
177177
sleep 3s
178178
fi
179-
[ ! -x mc ] && wget -q https://dl.minio.io/client/mc/release/linux-amd64/mc && chmod +x mc
179+
[ ! -x mc ] && .github/scripts/download_mc.sh linux-amd64 ./mc && chmod +x mc
180180
./mc alias set myminio http://localhost:9000 minioadmin minioadmin || ./mc alias set myminio http://127.0.0.1:9000 minioadmin minioadmin
181181
elif [ "$storage" == "gluster" ]; then
182182
dpkg -s glusterfs-server || .github/scripts/apt_install.sh glusterfs-server

0 commit comments

Comments
 (0)