From 07ed6406c019a3f504bb80beaa75b1af15874750 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Sun, 3 Nov 2024 19:36:41 +0100 Subject: [PATCH 1/8] Add testing files with extra JSON Array --- build/config/rmi_pacta_2023q4_pa2024ch.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/config/rmi_pacta_2023q4_pa2024ch.json b/build/config/rmi_pacta_2023q4_pa2024ch.json index 7f898f5d..26b45970 100644 --- a/build/config/rmi_pacta_2023q4_pa2024ch.json +++ b/build/config/rmi_pacta_2023q4_pa2024ch.json @@ -8,7 +8,10 @@ "test_matrix": { "peer_group": ["bank", "assetmanager", "insurance", "pensionfund", "other"], "language": ["EN", "DE", "FR"], - "user_results": ["https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data"], + "user_results": [ + "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data", + "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data_extra_array" + ], "exclude": [ { "language": "DE", From f6e91279d727c7b04bd40e70053734e845412bd7 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Sun, 3 Nov 2024 19:57:04 +0100 Subject: [PATCH 2/8] USe dev branch of `pacta.portfolio.report` --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2f275d4a..6f50ba3e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,7 +51,7 @@ Remotes: RMI-PACTA/pacta.portfolio.allocate, RMI-PACTA/pacta.portfolio.audit, RMI-PACTA/pacta.portfolio.import, - RMI-PACTA/pacta.portfolio.report, + RMI-PACTA/pacta.portfolio.report@97-extra-re-array, RMI-PACTA/pacta.portfolio.utils Depends: R (>= 3.5.0) From b0c454e48f73db51c811d37152edd5916937ceff Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Sun, 3 Nov 2024 20:08:13 +0100 Subject: [PATCH 3/8] Use correct path --- build/config/rmi_pacta_2023q4_pa2024ch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/config/rmi_pacta_2023q4_pa2024ch.json b/build/config/rmi_pacta_2023q4_pa2024ch.json index 26b45970..6003fcbf 100644 --- a/build/config/rmi_pacta_2023q4_pa2024ch.json +++ b/build/config/rmi_pacta_2023q4_pa2024ch.json @@ -10,7 +10,7 @@ "language": ["EN", "DE", "FR"], "user_results": [ "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data", - "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data_extra_array" + "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/extra_array/user_data" ], "exclude": [ { From 0a68635ed59dffe1ca866b3bf7ff1f946d414833 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 4 Nov 2024 10:06:51 +0100 Subject: [PATCH 4/8] Allow alternate user results paths --- .github/workflows/build-push-private.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-push-private.yml b/.github/workflows/build-push-private.yml index 5c2beb24..b31c3494 100644 --- a/.github/workflows/build-push-private.yml +++ b/.github/workflows/build-push-private.yml @@ -408,9 +408,13 @@ jobs: if: ${{ matrix.user_results }} env: USER_RESULTS_DIR: ${{ steps.prepare-results-dir.outputs.test-dir }}/user_dir + BLOB_SOURCE: ${{ matrix.user_results }}/${{ matrix.user_id }} USER_ID: ${{ matrix.user_id }} run: | - TEMP_USER_DIR="$USER_RESULTS_DIR/outputs/user_data/$USER_ID" + BLOB_STUB="$(echo $BLOB_SOURCE | sed -e 's/.*windows.net\/[^\/]*\///')" + echo "Blob stub: $BLOB_STUB" + TEMP_USER_DIR="$USER_RESULTS_DIR/$BLOB_STUB" + echo "Temp Dir user: $TEMP_USER_DIR" if [ -d $TEMP_USER_DIR ]; then mv \ --verbose \ From 01080b0b822e6774e0fca636e9e09bc728f80f16 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 4 Nov 2024 10:34:19 +0100 Subject: [PATCH 5/8] Append RANDOM to results path to allow (almost) processing identical inputs such as differing by only user_results --- .github/workflows/build-push-private.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push-private.yml b/.github/workflows/build-push-private.yml index b31c3494..09933bdc 100644 --- a/.github/workflows/build-push-private.yml +++ b/.github/workflows/build-push-private.yml @@ -365,7 +365,7 @@ jobs: echo "TEST_DIR_PARENT=$TEST_DIR_PARENT" echo "test-dir-parent=$TEST_DIR_PARENT" >> "$GITHUB_OUTPUT" - TEST_DIR="$TEST_DIR_PARENT/$language/$peer_group/$run_attempt" + TEST_DIR="$TEST_DIR_PARENT/$language/$peer_group/$run_attempt/$RANDOM" mkdir -p "$TEST_DIR" chmod -R 777 "$TEST_DIR" echo "TEST_DIR=$TEST_DIR" From ae771b251eb5300b77b3e532391a6f09d9267d55 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 4 Nov 2024 11:18:58 +0100 Subject: [PATCH 6/8] Upload Test dir, not just parent --- .github/workflows/build-push-private.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-push-private.yml b/.github/workflows/build-push-private.yml index 09933bdc..f86b72f1 100644 --- a/.github/workflows/build-push-private.yml +++ b/.github/workflows/build-push-private.yml @@ -474,7 +474,7 @@ jobs: id: upload-results uses: RMI-PACTA/actions/actions/azure/blob-copy@main with: - source: ${{ steps.prepare-results-dir.outputs.test-dir-parent }} + source: ${{ steps.prepare-results-dir.outputs.test-dir }} destination: https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-full overwrite: false @@ -482,7 +482,7 @@ jobs: id: upload-report uses: RMI-PACTA/actions/actions/azure/blob-copy@main with: - source: ${{ steps.prepare-results-dir.outputs.test-dir-parent }}/${{ matrix.language }}/${{ matrix.peer_group }}/${{ github.run_attempt }}/working_dir/50_Outputs + source: ${{ steps.prepare-results-dir.outputs.test-dir }}/working_dir/50_Outputs destination: https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-reports overwrite: false From a0a32f5f73eb33232da9e824b9136c9a0c1e7065 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 4 Nov 2024 11:48:49 +0100 Subject: [PATCH 7/8] Use only one set of user results --- .github/workflows/build-push-private.yml | 2 +- build/config/rmi_pacta_2023q4_pa2024ch.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-push-private.yml b/.github/workflows/build-push-private.yml index f86b72f1..b26c3b61 100644 --- a/.github/workflows/build-push-private.yml +++ b/.github/workflows/build-push-private.yml @@ -365,7 +365,7 @@ jobs: echo "TEST_DIR_PARENT=$TEST_DIR_PARENT" echo "test-dir-parent=$TEST_DIR_PARENT" >> "$GITHUB_OUTPUT" - TEST_DIR="$TEST_DIR_PARENT/$language/$peer_group/$run_attempt/$RANDOM" + TEST_DIR="$TEST_DIR_PARENT/$language/$peer_group/$run_attempt" mkdir -p "$TEST_DIR" chmod -R 777 "$TEST_DIR" echo "TEST_DIR=$TEST_DIR" diff --git a/build/config/rmi_pacta_2023q4_pa2024ch.json b/build/config/rmi_pacta_2023q4_pa2024ch.json index 6003fcbf..03052839 100644 --- a/build/config/rmi_pacta_2023q4_pa2024ch.json +++ b/build/config/rmi_pacta_2023q4_pa2024ch.json @@ -9,7 +9,6 @@ "peer_group": ["bank", "assetmanager", "insurance", "pensionfund", "other"], "language": ["EN", "DE", "FR"], "user_results": [ - "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/user_data", "https://pactadatadev.blob.core.windows.net/pa2024ch/outputs/extra_array/user_data" ], "exclude": [ From 8b23a421cf4f4d4d4b3446574c34fb6316f11559 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 4 Nov 2024 11:57:22 +0100 Subject: [PATCH 8/8] Use updated `main` for pacta.portfolio.report --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6f50ba3e..2f275d4a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,7 +51,7 @@ Remotes: RMI-PACTA/pacta.portfolio.allocate, RMI-PACTA/pacta.portfolio.audit, RMI-PACTA/pacta.portfolio.import, - RMI-PACTA/pacta.portfolio.report@97-extra-re-array, + RMI-PACTA/pacta.portfolio.report, RMI-PACTA/pacta.portfolio.utils Depends: R (>= 3.5.0)