ユーザー機能テストにおけるMS2（未病DB）メタデータ付与機能のテスト追加

.github/scripts/setup_rdm.sh

@@ -337,7 +337,7 @@ EOL
         bash "${script_dir}/setup_minio.sh" apply "${PWD}"
     fi
 
-    if [ "${WEKO_ENABLED:-false}" = "true" ]; then
+    if [ "${WEKO_ENABLED:-false}" = "true" ] || [ "${SKIP_METADATA:-false}" = "false" ]; then
         local script_dir
         script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
         python3 "${script_dir}/weko_setup_cert.py" \

.github/workflows/e2e-test.yml

@@ -220,6 +220,7 @@ jobs:
       WEKO_ENABLED: ${{ matrix.test-group.weko_enabled == true && 'true' || 'false' }}
       JUPYTERHUB_ENABLED: ${{ matrix.test-group.jupyterhub_enabled == true && 'true' || 'false' }}
       FLOWABLE_ENABLED: ${{ matrix.test-group.flowable_enabled == true && 'true' || 'false' }}
+      SKIP_METADATA: ${{ matrix.test-group.skip_metadata == true && 'true' || 'false' }}
       MINIO_ROOT_USER: e2eadmin
       MINIO_ROOT_PASSWORD: e2epassword123
       MINIO_ALIAS: ci-minio
@@ -329,7 +330,7 @@ jobs:
         fetch-depth: 0
 
     - name: Checkout WEKO repository
-      if: env.WEKO_ENABLED == 'true'
+      if: env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false'
       uses: actions/checkout@v4
       with:
         repository: RCOSDP/weko
@@ -344,7 +345,7 @@ jobs:
         path: RDM-flowable-gateway
 
     - name: Prepare WEKO compose
-      if: env.WEKO_ENABLED == 'true'
+      if: env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false'
       working-directory: e2e-tests
       run: |
         .github/scripts/setup_weko.sh prepare ../weko
@@ -889,13 +890,13 @@ jobs:
         test_rdm_endpoints
 
     - name: Install WEKO stack
-      if: env.WEKO_ENABLED == 'true'
+      if: env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false'
       working-directory: e2e-tests
       run: |
         .github/scripts/setup_weko.sh install ../weko
 
     - name: Configure WEKO connection info
-      if: env.WEKO_ENABLED == 'true'
+      if: env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false'
       run: |
         echo "WEKO_URL=https://192.168.168.167" >> $GITHUB_ENV
         echo "WEKO_ADMIN_EMAIL=wekosoftware@nii.ac.jp" >> $GITHUB_ENV  # gitleaks:allow
@@ -908,7 +909,7 @@ jobs:
         echo "IGNORE_HTTPS_ERRORS=true" >> $GITHUB_ENV
 
     - name: Verify RDM containers can connect to WEKO via HTTPS
-      if: env.WEKO_ENABLED == 'true'
+      if: env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false'
       working-directory: RDM-osf.io
       run: |
         set -xeu
@@ -1081,7 +1082,7 @@ jobs:
         if [ "${JUPYTERHUB_ENABLED}" = "true" ]; then
           args+=(--jupyterhub)
         fi
-        if [ "${WEKO_ENABLED}" = "true" ]; then
+        if [ "${WEKO_ENABLED}" = "true" ] || [ "${SKIP_METADATA}" = "false" ]; then
           args+=(--weko)
         fi
         if [ "${FLOWABLE_ENABLED}" = "true" ]; then
@@ -1219,13 +1220,13 @@ jobs:
         if-no-files-found: ignore
 
     - name: Collect WEKO logs
-      if: always() && env.WEKO_ENABLED == 'true'
+      if: always() && (env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false')
       working-directory: weko
       run: |
         docker compose -f docker-compose2.yml logs > ../e2e-tests/weko-docker-logs.txt 2>&1 || true
 
     - name: Upload WEKO logs
-      if: always() && env.WEKO_ENABLED == 'true'
+      if: always() && (env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false')
       uses: actions/upload-artifact@v4
       with:
         name: weko-logs-${{ matrix.test-group.name }}
@@ -1260,7 +1261,7 @@ jobs:
         retention-days: 7
 
     - name: Stop WEKO stack
-      if: always() && env.WEKO_ENABLED == 'true'
+      if: always() && (env.WEKO_ENABLED == 'true' || env.SKIP_METADATA == 'false')
       working-directory: e2e-tests
       run: |
         .github/scripts/setup_weko.sh down ../weko

resources/Datatest-Metadataアドオン-未病データベース/text1.csv

@@ -0,0 +1,101 @@
+col1,col2,col3,col4,col5
+1,0,5399,876,1973/2/26
+2,1,6651,6866,1976/7/17
+3,1,1688,6483,1975/9/6
+4,1,7055,6431,2001/5/13
+5,1,8081,1103,1982/4/25
+6,0,3460,5553,1976/12/2
+7,0,3272,4248,2001/1/19
+8,0,4559,1082,2016/12/25
+9,1,3945,9527,1985/7/25
+10,0,7360,5625,2007/6/28
+11,1,5128,1173,1978/7/3
+12,0,1532,6618,2003/6/21
+13,1,9587,201,2019/10/6
+14,0,8793,4304,1983/4/10
+15,1,9647,4927,2004/10/22
+16,0,6645,868,1980/5/2
+17,0,9101,1592,1989/8/5
+18,0,1270,2321,1977/3/1
+19,1,5190,2628,2013/8/14
+20,0,8437,2395,2010/12/21
+21,0,2315,8894,2014/1/2
+22,1,4937,2236,1977/4/5
+23,1,2811,3231,2004/6/10
+24,0,1909,9942,2019/9/4
+25,0,406,6159,1972/9/26
+26,1,6921,1669,2010/7/8
+27,0,4944,5275,2016/10/8
+28,0,5197,6676,2003/8/31
+29,0,3737,2582,1983/7/16
+30,0,150,9372,1981/6/8
+31,0,2806,4596,1991/7/20
+32,0,6592,5659,1985/5/4
+33,1,154,245,2017/10/16
+34,1,3757,4483,1996/11/30
+35,0,8142,6133,2023/2/18
+36,0,9917,9469,2022/11/16
+37,1,6837,344,1992/6/25
+38,0,9145,4704,2015/12/10
+39,0,3690,4279,1985/7/29
+40,1,926,251,1990/12/13
+41,1,8763,4676,2020/7/7
+42,0,5944,2481,1999/3/27
+43,0,3737,292,1975/11/18
+44,1,8632,5277,1981/11/3
+45,0,8427,2022,1996/11/9
+46,0,378,6963,1996/2/10
+47,1,354,810,1971/7/22
+48,1,700,6873,1994/5/11
+49,0,3943,5980,1974/10/31
+50,0,7685,1662,1978/11/19
+51,1,7068,8339,1994/3/6
+52,1,4677,3696,1991/2/14
+53,1,478,9770,1971/6/16
+54,1,8030,670,2003/11/11
+55,1,7641,2670,1971/12/16
+56,0,7712,7934,1987/5/1
+57,1,3922,9251,2012/5/3
+58,1,9601,3380,1978/3/24
+59,1,6905,5977,2003/11/23
+60,1,9802,6861,1985/12/27
+61,1,3781,6244,2006/10/13
+62,0,2164,4448,1990/6/13
+63,1,4344,7852,2021/8/20
+64,0,5521,7434,2019/6/21
+65,1,8476,9919,2004/9/5
+66,1,2098,1284,1975/12/20
+67,1,6230,1895,1977/3/20
+68,0,6303,1291,1985/12/29
+69,1,9494,4667,2008/12/23
+70,1,1001,687,2002/11/16
+71,1,8853,7692,1988/9/22
+72,1,3385,6755,1991/8/17
+73,1,7639,3362,2011/8/31
+74,0,3641,9705,1970/11/21
+75,0,4658,7779,1970/2/22
+76,0,3812,6061,1975/1/3
+77,1,4174,9894,1998/4/28
+78,0,724,4045,1986/3/3
+79,0,6664,8272,1972/1/25
+80,1,5111,5771,2011/11/18
+81,0,1582,3739,1979/6/3
+82,0,9965,2924,1999/12/2
+83,0,54,627,1975/5/19
+84,0,220,1138,1972/12/26
+85,1,1562,8784,2021/12/11
+86,1,2184,4653,2004/11/11
+87,0,683,5171,1999/1/28
+88,1,7899,7240,1988/1/11
+89,1,1236,1588,1985/8/4
+90,0,7189,6930,2007/1/20
+91,0,8760,3224,1992/1/23
+92,0,2529,3897,2012/10/15
+93,0,1957,5360,2018/4/29
+94,0,4710,5135,1970/10/14
+95,0,3096,7430,1976/8/19
+96,0,9391,8548,1986/4/19
+97,0,4560,8301,2014/7/26
+98,0,268,3554,1977/9/17
+99,0,566,7555,1990/11/14
+100,1,5810,9662,1974/10/10

resources/Datatest-Metadataアドオン-未病データベース/text1.tsv

@@ -0,0 +1,101 @@
+col1	col2	col3	col4	col5
+1	False	7196	1524	5927
+2	True	6135	518	5657
+3	True	5372	9033	9339
+4	False	7496	8431	293
+5	True	8258	6125	9077
+6	False	6315	3599	4735
+7	False	1385	7047	6360
+8	False	7991	1171	7704
+9	False	8841	7196	2277
+10	True	3433	7830	9268
+11	True	9610	2302	209
+12	True	9714	7112	8784
+13	True	2437	7005	4657
+14	False	1006	7608	2368
+15	True	1991	5483	9761
+16	False	2128	1943	9011
+17	True	3068	1874	8473
+18	True	9151	8577	3945
+19	True	9760	2046	3745
+20	True	8669	3346	9051
+21	True	5125	5301	2207
+22	True	545	1063	1854
+23	True	1019	6220	5354
+24	True	7585	32	1735
+25	True	9836	2035	3719
+26	False	5590	1329	5644
+27	False	932	7097	6128
+28	False	5001	2145	1470
+29	False	8159	684	8597
+30	False	8769	5203	9682
+31	True	14	1048	4564
+32	True	1939	9425	5644
+33	False	5829	6192	3366
+34	True	8899	7574	3426
+35	True	1920	7746	6875
+36	True	5841	752	1271
+37	False	6429	4266	1632
+38	True	4013	5512	4734
+39	False	4654	5396	4335
+40	True	716	7657	631
+41	False	8532	4226	8831
+42	True	1608	4104	1988
+43	False	3470	3625	9524
+44	False	3757	709	9695
+45	False	6398	64	4692
+46	False	6242	3100	9663
+47	True	7928	9014	7908
+48	True	2221	1280	5429
+49	True	6429	3340	9015
+50	False	8190	5335	8686
+51	False	4918	3612	7335
+52	True	6286	6167	1785
+53	True	8689	2326	8786
+54	False	8213	6226	5356
+55	True	5622	9974	5203
+56	False	5495	1182	2895
+57	False	4911	8144	5642
+58	True	8199	8190	2321
+59	False	5049	403	3225
+60	True	8393	2851	4494
+61	True	1706	7180	80
+62	False	7328	6475	8285
+63	False	967	7047	8943
+64	True	3178	7009	5512
+65	False	1987	8005	7850
+66	True	9028	6303	2947
+67	False	5304	1492	5966
+68	False	5830	6792	4775
+69	True	2293	345	2391
+70	True	1934	9215	6783
+71	False	8922	2741	1551
+72	True	2242	7570	13
+73	False	2163	3809	9071
+74	True	9647	7811	3608
+75	True	6903	2155	5223
+76	True	5313	201	4838
+77	True	6668	8	7017
+78	True	2039	6305	6419
+79	True	829	9987	3455
+80	True	6022	4418	7345
+81	False	5194	2458	5748
+82	False	7768	384	5714
+83	False	1491	9787	1847
+84	False	1895	8660	7129
+85	False	6660	4065	4775
+86	False	8126	7704	342
+87	True	7467	6308	736
+88	False	1260	4862	6366
+89	True	2800	5157	1396
+90	False	2993	3040	7611
+91	True	2213	9578	3478
+92	True	2116	6271	9503
+93	False	8356	905	3315
+94	False	2854	7601	452
+95	False	7822	5006	6786
+96	True	9348	4991	8261
+97	True	7871	7892	9278
+98	True	7789	6419	8799
+99	False	410	2692	7911
+100	False	9227	807	2927