Skip to content

[GRDM-63383] S3互換ストレージのCIをMinIOからRustFSに置き換え #53

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

Draft
yacchin1205 wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[GRDM-63383] S3互換ストレージのCIをMinIOからRustFSに置き換え #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c848f42
Replace MinIO with RustFS for S3 compat CI
yacchin1205 Sep 15, 2026
fac7ea8
Collect RustFS container logs as an artifact
yacchin1205 Sep 30, 2026
7381f94
Disable SigV2 s3compat tests on RustFS
yacchin1205 Sep 30, 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
36 changes: 2 additions & 34 deletions .github/scripts/generate_ci_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ set -xeuo pipefail

if [[ $# -lt 2 ]]; then
cat >&2 <<'USAGE'
Usage: generate_ci_config.sh <output_path> <base_config_yaml> [--minio] [--jupyterhub] [--weko] [--flowable] [--s3compatsigv4] [--s3compatsigv4-inst] [--wiki]
Usage: generate_ci_config.sh <output_path> <base_config_yaml> [--jupyterhub] [--weko] [--flowable] [--s3compatsigv4] [--s3compatsigv4-inst] [--wiki]
USAGE
exit 1
fi

OUTPUT=$1
BASE_CONFIG=$2
shift 2
MINIO=false
JUPYTERHUB=false
WEKO=false
FLOWABLE=false
Expand All @@ -21,9 +20,6 @@ WIKI=false

for arg in "$@"; do
case "$arg" in
--minio)
MINIO=true
;;
--jupyterhub)
JUPYTERHUB=true
;;
Expand Down Expand Up @@ -52,38 +48,10 @@ done

cp "${BASE_CONFIG}" "${OUTPUT}"

if [[ "${MINIO}" == "true" ]]; then
if [[ -z "${S3COMPAT_ACCESS_KEY_1:-}" || -z "${S3COMPAT_SECRET_KEY_1:-}" ]]; then
echo "S3 compat credentials are not set" >&2
exit 1
fi

cat >> "${OUTPUT}" <<EOF

storages_s3:
- id: 's3compat'
name: 'S3 Compatible Storage'
skip_too_many_files_check: true

s3compat_access_key_1: '${S3COMPAT_ACCESS_KEY_1}'
s3compat_secret_access_key_1: '${S3COMPAT_SECRET_KEY_1}'
s3compat_default_region_1: '${S3COMPAT_REGION}'
s3compat_test_bucket_name_1: '${S3COMPAT_BUCKET_NAME_1}'

s3compat_access_key_2: '${S3COMPAT_ACCESS_KEY_2}'
s3compat_secret_access_key_2: '${S3COMPAT_SECRET_KEY_2}'
s3compat_default_region_2: '${S3COMPAT_REGION}'
s3compat_test_bucket_name_2: '${S3COMPAT_BUCKET_NAME_2}'

s3compat_type_name_1: '${S3COMPAT_SERVICE_NAME}'
s3compat_type_name_2: '${S3COMPAT_SERVICE_NAME}'
EOF
else
cat >> "${OUTPUT}" <<'EOF'
cat >> "${OUTPUT}" <<'EOF'

storages_s3: []
EOF
fi

if [[ "${JUPYTERHUB}" == "true" ]]; then
if [[ -z "${TLJH_URL:-}" || -z "${TLJH_USERNAME:-}" || -z "${TLJH_PASSWORD:-}" ]]; then
Expand Down
158 changes: 0 additions & 158 deletions .github/scripts/setup_minio.sh
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions .github/scripts/setup_minio_buckets.sh
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions .github/scripts/setup_rdm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ start_rdm_services() {

SERVICES="kaken_elasticsearch $SERVICES"

if [ "${MINIO_ENABLED:-false}" = "true" ]; then
SERVICES="$SERVICES minio"
if [ "${RUSTFS_ENABLED:-false}" = "true" ]; then
SERVICES="$SERVICES rustfs"
fi

echo "Starting services: $SERVICES"
Expand Down Expand Up @@ -336,10 +336,10 @@ EOL
echo "" >> .docker-compose.wb.env
echo "SERVER_CONFIG_DOMAIN=http://192.168.168.167:7777" >> .docker-compose.wb.env

if [ "${MINIO_ENABLED:-false}" = "true" ]; then
if [ "${RUSTFS_ENABLED:-false}" = "true" ]; then
local script_dir
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
bash "${script_dir}/setup_minio.sh" apply "${PWD}"
bash "${script_dir}/setup_rustfs.sh" apply "${PWD}"
fi

if [ "${WEKO_ENABLED:-false}" = "true" ] || [ "${MIBYO_DB_ENABLED:-false}" = "true" ]; then
Expand Down
Loading
Loading