Skip to content

[GRDM-61058] WEKOアドオンのMigration後メタデータ送信テストを追加 #44

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

Open
yacchin1205 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[GRDM-61058] WEKOアドオンのMigration後メタデータ送信テストを追加 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b58550c
Dump full DOM of all frames on test failure
yacchin1205 Jun 16, 2026
a981ece
Capture full-page screenshot on test failure
yacchin1205 Jun 16, 2026
b1d2a4f
Add WEKO migration E2E test for metadata-access-rights regression
yacchin1205 Jun 19, 2026
93eafdb
Use transition_timeout for storage metadata-edit wait to reduce flaki…
yacchin1205 Jun 20, 2026
0b11c42
Set up WEKO migration regression test: run as project owner, propagat…
yacchin1205 Jun 20, 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
61 changes: 49 additions & 12 deletions .github/workflows/e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,31 @@ jobs:
weko_enabled: false
jupyterhub_enabled: false
flowable_enabled: false
- name: migration-from-20250906-weko
display_name: "Migration Test from 20250906 (WEKO)"
include_admin: true
migration_from:
repository: "RCOSDP/RDM-osf.io"
commit: "4c007f2"
osf_image: "niicloudoperation/rdm-osf.io:20250906"
ember_image: "niicloudoperation/rdm-ember-osf-web:20250906"
cas_image: "niicloudoperation/rdm-cas-overlay:20250906"
mfr_image: "niicloudoperation/rdm-modular-file-renderer:20250906"
wb_image: "niicloudoperation/rdm-waterbutler:20250906"
initial_data_notebook: "取りまとめ-Migration前-20250906.ipynb"
post_migration_notebook: "取りまとめ-Migration後-20250906-weko.ipynb"
exclude_notebooks: |
テスト手順-WEKOアドオン-メタデータ送信-書誌情報.ipynb
テスト手順-WEKOアドオン-メタデータ送信-書誌情報＋根拠データ.ipynb
minio_enabled: false
weko_enabled: true
weko_test_mode: direct
skip_login: true
skip_default_storage: true
skip_metadata: true
skip_admin: true
jupyterhub_enabled: false
flowable_enabled: false
- name: user-minio
display_name: "User Tests (MinIO)"
include_admin: false
Expand Down Expand Up @@ -1016,21 +1041,33 @@ jobs:

# Create result directory (parent already exists from checkout)
mkdir -p ../result


# Build a typed parameter file via generate_ci_config.sh (single source of
# type resolution, e.g. ignore_https_errors -> bool) instead of -p strings.
cat > /tmp/post_base.config.yaml <<'EOF'
rdm_url: 'http://192.168.168.167:5000/'
admin_rdm_url: 'http://192.168.168.167:8001/'
idp_name_1: 'FakeCAS'
idp_username_1: 'testuser1@example.com'
idp_password_1: 'testpass123'
idp_name_2: 'FakeCAS'
idp_username_2: 'testuser2@example.com'
idp_password_2: 'testpass456'
transition_timeout: 60000
EOF

CONFIG_ARGS=(/tmp/post.config.yaml /tmp/post_base.config.yaml)
if [ "${WEKO_ENABLED}" = "true" ]; then
CONFIG_ARGS+=(--weko)
fi
../.github/scripts/generate_ci_config.sh "${CONFIG_ARGS[@]}"

# Execute the post-migration test notebook
papermill ${{ matrix.test-group.migration_from.post_migration_notebook }} \
../result/${{ matrix.test-group.migration_from.post_migration_notebook }} \
-p rdm_url "http://192.168.168.167:5000/" \
-p admin_rdm_url "http://192.168.168.167:8001/" \
-p idp_name_1 "FakeCAS" \
-p idp_username_1 "testuser1@example.com" \
-p idp_password_1 "testpass123" \
-p idp_name_2 "FakeCAS" \
-p idp_username_2 "testuser2@example.com" \
-p idp_password_2 "testpass456" \
-p default_result_path "../result" \
-p transition_timeout 60000

-f /tmp/post.config.yaml \
-p default_result_path "../result"

echo "Post-migration tests completed"

- name: Create test users and projects
Expand Down
120 changes: 109 additions & 11 deletions migrations/Migration前手順-Metadataアドオン.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9579,9 +9579,10 @@
"async def _step(page):\n",
" await grdm.get_select_expanded_storage_title_locator(page, target_storage_name).click()\n",
" \n",
" await expect(page.locator('//*[text() = \"メタデータ編集\"]')).to_be_enabled(timeout=10000)\n",
" await expect(page.locator('//*[text() = \"メタデータ編集\"]')).to_be_enabled(timeout=transition_timeout)\n",
"\n",
"await run_pw(_step)"
"await run_pw(_step)\n",
""
]
},
{
Expand Down Expand Up @@ -10096,10 +10097,20 @@
"current": "f868b2bd-dbb4-11ec-a940-a39334ab888f-20-2962-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-19-3c91-6b11-057f-36ed-b1d0-a2b9-1666-8eaa-dbc9-e25f",
"previous": "b0e07ea3-dbb4-11ec-80e7-a39334ab888f-17-642d-b419-1472-2606-b16d-5646-6abc-726d-f7c2-c07a"
},
{
"current": "f868b2bd-dbb4-11ec-a940-a39334ab888f-21-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1-4122",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-22-36ed-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db",
"previous": "b0e07ea3-dbb4-11ec-80e7-a39334ab888f-20-2606-b16d-5646-6abc-726d-f7c2-c07a-0406-d0f3-25de"
},
{
"current": "f868b2bd-dbb4-11ec-a940-a39334ab888f-21-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1-4122",
"next": "48466952-6b7f-11f1-af10-faebbd0a01ef",
"previous": "b0e07ea3-dbb4-11ec-80e7-a39334ab888f-21-b16d-5646-6abc-726d-f7c2-c07a-0406-d0f3-25de-7682"
}
],
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-22-36ed-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db",
"previous": "b0e07ea3-dbb4-11ec-80e7-a39334ab888f-20-2606-b16d-5646-6abc-726d-f7c2-c07a-0406-d0f3-25de"
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db-5ea9",
"previous": "b0e07ea3-dbb4-11ec-80e7-a39334ab888f-21-b16d-5646-6abc-726d-f7c2-c07a-0406-d0f3-25de-7682"
},
"lc_wrapper": {
"log_history": [
Expand Down Expand Up @@ -10306,10 +10317,30 @@
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-22-36ed-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-18-e96c-8e70-31fe-bd28-ff2c-3abb-8ee9-316c-8956-c2bd",
"previous": "f868b2bd-dbb4-11ec-a940-a39334ab888f-17-5efb-f1f6-1755-2962-6196-1464-6e7a-b487-702e-284e"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db-5ea9",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-21-bd28-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e",
"previous": "f868b2bd-dbb4-11ec-a940-a39334ab888f-20-2962-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db-5ea9",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e-2484",
"previous": "48466952-6b7f-11f1-af10-faebbd0a01ef"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db-5ea9",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e-2484",
"previous": "4877adc8-6b7f-11f1-a41d-faebbd0a01ef"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-b1d0-a2b9-1666-8eaa-dbc9-e25f-6b57-8be4-b1db-5ea9",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e-2484",
"previous": "48466952-6b7f-11f1-af10-faebbd0a01ef"
}
],
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-21-bd28-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e",
"previous": "f868b2bd-dbb4-11ec-a940-a39334ab888f-20-2962-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1"
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-ff2c-3abb-8ee9-316c-8956-c2bd-d57c-0259-220e-2484",
"previous": "f868b2bd-dbb4-11ec-a940-a39334ab888f-21-6196-1464-6e7a-b487-702e-284e-8631-c670-6aa1-4122"
},
"pinnedOutputTabIndex": 0,
"run_through_control": {
Expand Down Expand Up @@ -25212,10 +25243,15 @@
"current": "56f650de-dbb1-11ec-a9af-a39334ab888f-21-c7bb-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-20-5afa-d8de-c298-03f1-a99c-81d1-6673-efb3-04a4-0097",
"previous": "56f64ef7-dbb1-11ec-9acd-a39334ab888f-18-3134-0903-4eae-de51-6988-6e83-cf8e-50a0-baa7-1281"
},
{
"current": "56f650de-dbb1-11ec-a9af-a39334ab888f-22-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea-a2ec",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-03f1-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c",
"previous": "56f64ef7-dbb1-11ec-9acd-a39334ab888f-21-de51-6988-6e83-cf8e-50a0-baa7-1281-f26d-fdf8-7817"
}
],
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-03f1-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c",
"previous": "56f64ef7-dbb1-11ec-9acd-a39334ab888f-21-de51-6988-6e83-cf8e-50a0-baa7-1281-f26d-fdf8-7817"
"next": "c7321d92-6bbb-11f1-a506-faebbd0a01ef",
"previous": "56f64ef7-dbb1-11ec-9acd-a39334ab888f-22-6988-6e83-cf8e-50a0-baa7-1281-f26d-fdf8-7817-358b"
},
"lc_wrapper": {
"log_history": [
Expand Down Expand Up @@ -25320,6 +25356,58 @@
"await run_pw(_step)"
]
},
{
"cell_type": "markdown",
"metadata": {
"lc_cell_meme": {
"current": "c7321d92-6bbb-11f1-a506-faebbd0a01ef",
"history": [
{
"current": "c7321d92-6bbb-11f1-a506-faebbd0a01ef",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-24-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c-40df",
"previous": "56f650de-dbb1-11ec-a9af-a39334ab888f-22-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea-a2ec"
}
],
"next": "c76c71f4-6bbb-11f1-8035-faebbd0a01ef",
"previous": "56f650de-dbb1-11ec-a9af-a39334ab888f-22-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea-a2ec"
}
},
"source": [
"## 「TESTMETADATA」フォルダにファイルをアップロードする\n",
"\n",
"「TESTMETADATA」フォルダ直下にファイルがアップロードされること\n",
""
]
},
{
"cell_type": "code",
"metadata": {
"lc_cell_meme": {
"current": "c76c71f4-6bbb-11f1-8035-faebbd0a01ef",
"next": "bc31acd6-dbb2-11ec-850b-a39334ab888f-24-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c-40df",
"previous": "c7321d92-6bbb-11f1-a506-faebbd0a01ef"
}
},
"source": [
"import os\n",
"import tempfile\n",
"\n",
"async def _step(page):\n",
" upload_path = os.path.join(tempfile.gettempdir(), 'testdata.csv')\n",
" with open(upload_path, 'w') as f:\n",
" f.write('a,b\\n1,2\\n')\n",
" await expect(grdm.get_select_folder_droppable_locator(page, 'TESTMETADATA')).to_be_visible(timeout=transition_timeout)\n",
" dropzone = grdm.get_select_folder_droppable_xpath('TESTMETADATA')\n",
" await grdm.drop_file(page, dropzone, upload_path)\n",
" await grdm.wait_for_uploaded(page, 'testdata.csv')\n",
" await expect(grdm.get_select_file_title_locator(page, 'testdata.csv')).to_be_visible(timeout=transition_timeout)\n",
"\n",
"await run_pw(_step)\n",
""
],
"outputs": [],
"execution_count": null
},
{
"cell_type": "markdown",
"id": "55660ab6-fd1e-420e-a69a-e6bab50b56eb",
Expand Down Expand Up @@ -25453,10 +25541,20 @@
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-23-03f1-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-19-cc89-a13f-e0a4-3eb0-f7d9-594c-c2b5-4ac2-f593-563d",
"previous": "56f650de-dbb1-11ec-a9af-a39334ab888f-18-7702-0181-5e86-c7bb-1540-6535-5cbe-42b3-b1a5-8b13"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-24-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c-40df",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-3eb0-f7d9-594c-c2b5-4ac2-f593-563d-0831-1820-ea43",
"previous": "56f650de-dbb1-11ec-a9af-a39334ab888f-21-c7bb-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea"
},
{
"current": "bc31acd6-dbb2-11ec-850b-a39334ab888f-24-a99c-81d1-6673-efb3-04a4-0097-4e18-77d0-790c-40df",
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-23-f7d9-594c-c2b5-4ac2-f593-563d-0831-1820-ea43-92cc",
"previous": "c7321d92-6bbb-11f1-a506-faebbd0a01ef"
}
],
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-22-3eb0-f7d9-594c-c2b5-4ac2-f593-563d-0831-1820-ea43",
"previous": "56f650de-dbb1-11ec-a9af-a39334ab888f-21-c7bb-1540-6535-5cbe-42b3-b1a5-8b13-2df5-152c-0fea"
"next": "224feb70-dbb4-11ec-ad25-a39334ab888f-23-f7d9-594c-c2b5-4ac2-f593-563d-0831-1820-ea43-92cc",
"previous": "c76c71f4-6bbb-11f1-8035-faebbd0a01ef"
},
"pinnedOutputTabIndex": 0,
"run_through_control": {
Expand Down Expand Up @@ -28652,4 +28750,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
Loading
Loading