From 78cc68d6a59c62c9c454ccb43f8a68f45e9dca2e Mon Sep 17 00:00:00 2001 From: ShotaKitazawa Date: Sun, 22 Aug 2021 14:04:57 +0900 Subject: [PATCH 1/4] rename --- {.github => .github_}/.golangci.yml | 0 {.github => .github_}/label-path-mapping.yml | 0 {.github => .github_}/pull_request_template.md | 0 {.github => .github_}/workflows/checker.yaml | 0 {.github => .github_}/workflows/frontend.yml | 0 {.github => .github_}/workflows/go.yml | 0 {.github => .github_}/workflows/labeled.yml | 0 {.github => .github_}/workflows/nodejs.yml | 0 {.github => .github_}/workflows/packer.yml | 0 {.github => .github_}/workflows/perl.yml | 0 {.github => .github_}/workflows/php.yml | 0 {.github => .github_}/workflows/python.yml | 0 {.github => .github_}/workflows/ruby.yml | 0 {.github => .github_}/workflows/rust.yml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {.github => .github_}/.golangci.yml (100%) rename {.github => .github_}/label-path-mapping.yml (100%) rename {.github => .github_}/pull_request_template.md (100%) rename {.github => .github_}/workflows/checker.yaml (100%) rename {.github => .github_}/workflows/frontend.yml (100%) rename {.github => .github_}/workflows/go.yml (100%) rename {.github => .github_}/workflows/labeled.yml (100%) rename {.github => .github_}/workflows/nodejs.yml (100%) rename {.github => .github_}/workflows/packer.yml (100%) rename {.github => .github_}/workflows/perl.yml (100%) rename {.github => .github_}/workflows/php.yml (100%) rename {.github => .github_}/workflows/python.yml (100%) rename {.github => .github_}/workflows/ruby.yml (100%) rename {.github => .github_}/workflows/rust.yml (100%) diff --git a/.github/.golangci.yml b/.github_/.golangci.yml similarity index 100% rename from .github/.golangci.yml rename to .github_/.golangci.yml diff --git a/.github/label-path-mapping.yml b/.github_/label-path-mapping.yml similarity index 100% rename from .github/label-path-mapping.yml rename to .github_/label-path-mapping.yml diff --git a/.github/pull_request_template.md b/.github_/pull_request_template.md similarity index 100% rename from .github/pull_request_template.md rename to .github_/pull_request_template.md diff --git a/.github/workflows/checker.yaml b/.github_/workflows/checker.yaml similarity index 100% rename from .github/workflows/checker.yaml rename to .github_/workflows/checker.yaml diff --git a/.github/workflows/frontend.yml b/.github_/workflows/frontend.yml similarity index 100% rename from .github/workflows/frontend.yml rename to .github_/workflows/frontend.yml diff --git a/.github/workflows/go.yml b/.github_/workflows/go.yml similarity index 100% rename from .github/workflows/go.yml rename to .github_/workflows/go.yml diff --git a/.github/workflows/labeled.yml b/.github_/workflows/labeled.yml similarity index 100% rename from .github/workflows/labeled.yml rename to .github_/workflows/labeled.yml diff --git a/.github/workflows/nodejs.yml b/.github_/workflows/nodejs.yml similarity index 100% rename from .github/workflows/nodejs.yml rename to .github_/workflows/nodejs.yml diff --git a/.github/workflows/packer.yml b/.github_/workflows/packer.yml similarity index 100% rename from .github/workflows/packer.yml rename to .github_/workflows/packer.yml diff --git a/.github/workflows/perl.yml b/.github_/workflows/perl.yml similarity index 100% rename from .github/workflows/perl.yml rename to .github_/workflows/perl.yml diff --git a/.github/workflows/php.yml b/.github_/workflows/php.yml similarity index 100% rename from .github/workflows/php.yml rename to .github_/workflows/php.yml diff --git a/.github/workflows/python.yml b/.github_/workflows/python.yml similarity index 100% rename from .github/workflows/python.yml rename to .github_/workflows/python.yml diff --git a/.github/workflows/ruby.yml b/.github_/workflows/ruby.yml similarity index 100% rename from .github/workflows/ruby.yml rename to .github_/workflows/ruby.yml diff --git a/.github/workflows/rust.yml b/.github_/workflows/rust.yml similarity index 100% rename from .github/workflows/rust.yml rename to .github_/workflows/rust.yml From 2b2e40db3dc3bc97df948c48c202f029bb5c987e Mon Sep 17 00:00:00 2001 From: ShotaKitazawa Date: Sun, 22 Aug 2021 14:08:05 +0900 Subject: [PATCH 2/4] update READMEs --- development/README.md | 2 +- provisioning/ansible-replace-bench/README.md | 29 ----------------- .../ansible-retest-contestant/README.md | 31 ------------------- 3 files changed, 1 insertion(+), 61 deletions(-) diff --git a/development/README.md b/development/README.md index 95f7a98a9..64ec2f665 100644 --- a/development/README.md +++ b/development/README.md @@ -1,6 +1,6 @@ # development -開発用資材置場です。 +**このディレクトリ予選問題開発用のディレクトリです。** 開発する前に S3 から必要なデータを取ってくる必要があるため、 `初期データについて` の項はご一読ください。 diff --git a/provisioning/ansible-replace-bench/README.md b/provisioning/ansible-replace-bench/README.md index f2f0befc3..42cd04ce7 100644 --- a/provisioning/ansible-replace-bench/README.md +++ b/provisioning/ansible-replace-bench/README.md @@ -8,32 +8,3 @@ ansible-replace-bench * ansible 4.2.0 (core 2.11.2) -### 実行方法 - -**この Playbook は踏み台サーバで実行されることが想定されています。** - -* teams.json から hosts ファイルを生成 - -``` -python generate_hosts.py > hosts -``` - -* `ssh_config` にて jump サーバの指定 - * 本番環境の構成上、手元から ansible を実行する場合は jump サーバ経由で ssh する必要があります - -```diff - Host 192.168.* - User isucon-admin -+ ProxyJump - StrictHostKeyChecking no - UserKnownHostsFile /dev/null -``` - -* 差し替えたいコンパイル済みのベンチバイナリ (`bench`) 、supervisorバイナリ (`isuxportal-supervisor`) をこのディレクトリに配置 - * 配置してない場合、task は skip されます - -* Ansible の実行 - -``` -ansible-playbook -i hosts tasks.yml -``` diff --git a/provisioning/ansible-retest-contestant/README.md b/provisioning/ansible-retest-contestant/README.md index bbb1a181a..fdb3339bd 100644 --- a/provisioning/ansible-retest-contestant/README.md +++ b/provisioning/ansible-retest-contestant/README.md @@ -8,34 +8,3 @@ ansible-retest-contestant * ansible 4.2.0 (core 2.11.2) -### 実行方法 - -* `ssh_config` にて jump サーバの指定 - * 本番環境の構成上、手元から ansible を実行する場合は jump サーバ経由で ssh する必要があります - -```diff - Host * - User isucon-admin - ControlMaster auto - ControlPath ~/.ssh/%C - ControlPersist 60s -+ IdentityFile <秘密鍵のPATH> -``` - -* 再配置するチェックスクリプトは envchecker に配置 - * isucon-env-checker は必要に応じてビルドを行う - * 配置してない場合、task は fail されます - -``` -cp -a ../../extra/envchecker . -pushd envchecker/isucon-env-checker -env GOOS=linux GOARCH=amd64 go build -scp isucon-env-checker isucon11-qualify/extra/envchecker/isucon-env-checker/isucon-env-checker -popd -``` - -* Ansible の実行 - -``` -ansible-playbook -i hosts tasks.yml -``` From 13babddbf6c3ab10214ad535774cf11b6a11d0bc Mon Sep 17 00:00:00 2001 From: ShotaKitazawa Date: Sun, 22 Aug 2021 14:17:08 +0900 Subject: [PATCH 3/4] update READMEs --- extra/envchecker/README.md | 3 +++ extra/initial-data/README.md | 4 ++++ extra/jiaapi-mock/README.md | 6 ++++++ 3 files changed, 13 insertions(+) create mode 100644 extra/envchecker/README.md create mode 100644 extra/initial-data/README.md create mode 100644 extra/jiaapi-mock/README.md diff --git a/extra/envchecker/README.md b/extra/envchecker/README.md new file mode 100644 index 000000000..b5ac97487 --- /dev/null +++ b/extra/envchecker/README.md @@ -0,0 +1,3 @@ +# envchecker + +競技環境を検証するためのもの diff --git a/extra/initial-data/README.md b/extra/initial-data/README.md new file mode 100644 index 000000000..509c8294e --- /dev/null +++ b/extra/initial-data/README.md @@ -0,0 +1,4 @@ +### initial-data + +初期データ生成用 + diff --git a/extra/jiaapi-mock/README.md b/extra/jiaapi-mock/README.md new file mode 100644 index 000000000..ae0f12b24 --- /dev/null +++ b/extra/jiaapi-mock/README.md @@ -0,0 +1,6 @@ +### jiaapi-mock + +以下の機能を持ちます。 + +* Isucondition にログインするための JWT を生成する JIA Auth サービス +* ISU の activate リクエストを受けて、 ISU を模した Post IsuCondition をリクエストするサービス From 2acc59e30cdd562f5563dfcae9a0e2eed90bf13c Mon Sep 17 00:00:00 2001 From: Mahito Date: Sun, 22 Aug 2021 14:36:04 +0900 Subject: [PATCH 4/4] Update development/README.md --- development/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/README.md b/development/README.md index 64ec2f665..9f4fba7ea 100644 --- a/development/README.md +++ b/development/README.md @@ -1,6 +1,6 @@ # development -**このディレクトリ予選問題開発用のディレクトリです。** +**このディレクトリは予選問題開発用です。** 開発する前に S3 から必要なデータを取ってくる必要があるため、 `初期データについて` の項はご一読ください。