Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion config/system.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ SQUID_CPU,cross,squid_login,squid_jacamar,NQSV_SQUID_CPU,DBG
SQUID_GPU,cross,squid_login,squid_jacamar,NQSV_SQUID_GPU,DBG
SQUID_VECTOR,cross,squid_login,squid_jacamar,NQSV_SQUID_VECTOR,SQUID
OCTOPUS,cross,octopus_login,octopus_jacamar,NQSV_OCTOPUS,DBG
FNCX,native,,fncx-curl-jq,none,small
2 changes: 1 addition & 1 deletion docs/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ Use these examples when deciding whether to split a pull request or start GitLab
| `config/system_info.csv` only / `config/system_info.csv`のみ | `Result Server Tests` should verify public site config consistency / 公開site config整合性を`Result Server Tests`で確認 | No benchmark run because this file is portal display metadata / portal表示metadataなのでbenchmark不要 |
| `config/system.csv` or `config/queue.csv` for a public system / 公開system向けの`config/system.csv`または`config/queue.csv` | `Result Server Tests` should run the site config preflight / `Result Server Tests`でsite config preflightを実行 | Start `GitLab Manual CI` too when benchmark execution behavior needs validation / benchmark実行挙動の検証が必要なら`GitLab Manual CI`も起動 |
| `scripts/bk_functions.sh`, `scripts/result.sh`, or `scripts/result_server/**` only / `scripts/bk_functions.sh`、`scripts/result.sh`、または`scripts/result_server/**`のみ | `Result Server Tests` should run when the path filter matches; `Shellcheck` should run for `.sh` changes / path filter対象なら`Result Server Tests`が動く; `.sh`変更では`Shellcheck`が動く | Protected-branch sync uses `ci.skip`; direct/manual GitLab pipelines run because `.gitlab-ci.yml` treats `scripts/**/*` as benchmark-affecting / protected branch syncは`ci.skip`を使う。直接/手動GitLab pipelineでは`.gitlab-ci.yml`が`scripts/**/*`をbenchmark影響ありとして扱うため実行される |
| `programs/qws/**/*` or `scripts/job/**/*` / `programs/qws/**/*`または`scripts/job/**/*` | `Shellcheck` should run for `.sh` changes / `.sh`変更では`Shellcheck`が動く | Start `GitLab Manual CI` when benchmark validation is needed, preferably with explicit `code` and `system` filters / benchmark検証が必要なら`code`と`system`を明示して`GitLab Manual CI`を起動 |
| `programs/qws/**/*`, `scripts/job_functions.sh`, or `scripts/test_submit.sh` / `programs/qws/**/*`、`scripts/job_functions.sh`、または`scripts/test_submit.sh` | `Shellcheck` should run for `.sh` changes / `.sh`変更では`Shellcheck`が動く | Start `GitLab Manual CI` when benchmark validation is needed, preferably with explicit `code` and `system` filters / benchmark検証が必要なら`code`と`system`を明示して`GitLab Manual CI`を起動 |
| `benchpark-bridge/scripts/**/*.sh` / `benchpark-bridge/scripts/**/*.sh` | `Shellcheck` should run / `Shellcheck`が動く | Start `GitLab Manual CI` with `benchpark=true` or `park_only=true` when BenchPark execution behavior needs validation / BenchPark実行挙動の検証が必要なら`benchpark=true`または`park_only=true`で`GitLab Manual CI`を起動 |
| `.github/workflows/sync-to-gitlab.yml` or `.github/actions/prepare-gitlab-repo/action.yml` / `.github/workflows/sync-to-gitlab.yml`または`.github/actions/prepare-gitlab-repo/action.yml` | Validate on the GitHub Actions side / GitHub Actions側で確認 | Skipped by `.gitlab-ci.yml` rules when changed alone; protected-branch sync pushes it with `ci.skip` / 単独変更なら`.gitlab-ci.yml` rulesでskip。protected-branch syncでは`ci.skip`付きでpushされる |
| `.gitlab-ci.yml` / `.gitlab-ci.yml` | Review the GitLab rule diff carefully / GitLab rule差分を慎重にreview | Start `GitLab Manual CI` if rule behavior itself needs validation / rule挙動そのものの検証が必要なら`GitLab Manual CI`を起動 |
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/add-site.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ GitLab Runner と Jacamar-CI をユーザ権限でセットアップし、CI/CD

セットアップ前に、対象ログインノードから GitLab サーバへ到達できるか確認します。GitLab Runner は GitLab 側から接続されるのではなく、ログインノード上の常駐プロセスが GitLab へ job を取りに行きます。

まず軽量な preflight script を実行します。この script は scheduler job を投入せず、ログインノード上で `gitlab.com`、`github.com`、CI 用 GitLab への direct/proxy 接続、proxy 候補探索、`systemctl --user`、`loginctl` の状態を確認します。proxy 候補は現在の環境変数、shell profile、system profile、既存 runner の systemd unit、`config.toml` から探索し、疎通した候補を `setup_runner.sh --proxy` の推奨値として表示します。
まず軽量な preflight script を実行します。この script は scheduler job を投入せず、ログインノード上で `gitlab.com`、`github.com`、CI 用 GitLab に加えて、`setup_runner.sh` が取得する GitLab Runner binary、Go、gperf、libseccomp、Jacamar-CI repo への direct/proxy 接続を確認します。あわせて proxy 候補探索、`systemctl --user`、`loginctl` の状態も確認します。proxy 候補は現在の環境変数、shell profile、system profile、既存 runner の systemd unit、`config.toml` から探索し、疎通した候補を `setup_runner.sh --proxy` の推奨値として表示します。

```bash
GITLAB_URL="https://YOUR_GITLAB_SERVER"
Expand All @@ -62,7 +62,7 @@ curl -fsSL https://raw.githubusercontent.com/RIKEN-RCCS/benchkit/main/scripts/si
--gitlab-url "$GITLAB_URL"
```

preflight が `Suggested setup option: --proxy ...` を表示した場合は、その値を `setup_runner.sh --proxy` に渡します。以下は手動で同じ観点を確認したい場合のコマンドです
preflight が `Suggested setup option: --proxy ...` を表示した場合は、その値を `setup_runner.sh --proxy` に渡します。以下は手動で CI 用 GitLab への接続を確認したい場合の最小コマンドです。実際の preflight は、この確認に加えて runner setup に必要な download endpoint も検査します

```bash
GITLAB_URL="https://YOUR_GITLAB_SERVER"
Expand Down
5 changes: 0 additions & 5 deletions programs/qws/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ case "$system" in
make -j 2 fugaku_benchmark= omp=1 compiler=gnu arch=skylake rdma= mpi= powerapi=
#gcc -v
;;
FNCX)
# Dummy build for Docker runner testing (no compiler needed)
echo "Dummy build for FNCX Docker runner test"
echo aaaa > main
;;
AI4SS)
module load nvhpc-hpcx/26.3
make -j 8 omp=1 compiler=nvhpc-hpcx arch=grace rdma= mpi=1
Expand Down
1 change: 0 additions & 1 deletion programs/qws/list.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ SQUID_GPU,yes,1,1,38,00:10:00
SQUID_VECTOR,yes,1,1,8,00:30:00
OCTOPUS,yes,1,1,24,00:10:00
Camphor3,yes,1,1,112,0:10:00
FNCX,yes,1,1,1,0:10:00
4 changes: 0 additions & 4 deletions programs/qws/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ case "$system" in
bk_emit_result --fom 123.56 --fom-version dummy --exp CheckingPrivateRepo --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result
emit_qws_dummy_padata ../results/padata0.tgz
;;
FNCX)
echo 'dummy call for FNCX Docker runner test'
bk_emit_result --fom 99.99 --fom-version dummy --exp FNCXTest --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result
;;
AI4SS)
module load nvhpc-hpcx/26.3
export OMP_NUM_THREADS=72
Expand Down
4 changes: 2 additions & 2 deletions scripts/test_submit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ echo bash programs/$code/run.sh $system $nodes $numproc_node $nthreads >> script

# --- システム別ジョブ投入 ---
case "$system" in
FugakuLN|FNCX)
FugakuLN)
echo "Notice: system=$system → submit test will NOT be performed."
exit 1
;;
Expand Down Expand Up @@ -250,7 +250,7 @@ case "$system" in
;;
*)
echo "Error: Unknown system '$system'"
echo "Supported systems: AI4SS, Fugaku, FugakuCN, FugakuLN, FNCX, GenkaiA, GenkaiB, GenkaiC, Odyssey, Aquarius, Pegasus, Sirius, TSUBAME4, Camphor3, SQUID_CPU, SQUID_GPU, SQUID_VECTOR, OCTOPUS, Grand_C, Grand_G, AOBA_A, AOBA_B, AOBA_S, RC_GH200, RC_DGXSP, RC_GENOA, RC_FX700, MiyabiC, MiyabiG"
echo "Supported systems: AI4SS, Fugaku, FugakuCN, FugakuLN, GenkaiA, GenkaiB, GenkaiC, Odyssey, Aquarius, Pegasus, Sirius, TSUBAME4, Camphor3, SQUID_CPU, SQUID_GPU, SQUID_VECTOR, OCTOPUS, Grand_C, Grand_G, AOBA_A, AOBA_B, AOBA_S, RC_GH200, RC_DGXSP, RC_GENOA, RC_FX700, MiyabiC, MiyabiG"
exit 1
;;
esac
Loading