Develop

.github/workflows/build-push-private.yml

@@ -468,28 +468,23 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-      # https://github.com/marketplace/actions/azure-cli-action#workflow-to-execute-an-azure-cli-script-of-a-specific-cli-version
-      - name: Upload results to blob store
-        uses: azure/CLI@v2
-        env:
-          REPORTS_DESTINATION_URL: ${{ needs.read-config.outputs.reports-destination-url }}
-          RESULTS_DESTINATION_URL: ${{ needs.read-config.outputs.results-destination-url }}
-          language: ${{ matrix.language }}
-          peer_group: ${{ matrix.peer_group }}
-          run_attempt: ${{ github.run_attempt }}
-          test_dir_parent: ${{ env.TEST_DIR_PARENT }}
+      - name: Upload results to Blob store 
+        id: upload-results
+        uses: RMI-PACTA/actions/actions/azure/blob-copy@blob-copy-python
         with:
-          inlineScript: |
-            az storage copy \
-              --source "$test_dir_parent" \
-              --destination "$RESULTS_DESTINATION_URL" \
-              --recursive
-
-            az storage copy \
-              --source "$test_dir_parent" \
-              --destination "$REPORTS_DESTINATION_URL" \
-              --include-path "$language/$peer_group/$run_attempt/working_dir/50_Outputs" \
-              --recursive
+          source: ${{ env.TEST_DIR_PARENT }}
+          destination: https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-full
+          overwrite: false
+          log_level: debug
+
+      - name: Upload report to Blob store 
+        id: upload-report
+        uses: RMI-PACTA/actions/actions/azure/blob-copy@blob-copy-python
+        with:
+          source: ${{ env.TEST_DIR_PARENT }}/${{ matrix.language }}/${{ matrix.peer_group }}/${{ github.run_attempt }}/working_dir/50_Outputs
+          destination: https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-reports
+          overwrite: false
+          log_level: debug
 
       - name: Export Outputs
         id: export-outputs
@@ -503,27 +498,23 @@ jobs:
           echo "blob-dir=$BLOB_DIR" >> "$GITHUB_OUTPUT"
           echo "blob-dir=$BLOB_DIR" >> "$GITHUB_ENV"
 
-          PUBLIC_BLOB_URL="https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-reports"
-
-          if [ "$REPORT_URL" = "$PUBLIC_BLOB_URL" ]; then
-            REPORT_URL="$BLOB_DIR/report/index.html"
-            echo "report-url=$REPORT_URL"
-            echo "report-url=$REPORT_URL" >> "$GITHUB_OUTPUT"
-            echo "report-url=$REPORT_URL" >> "$GITHUB_ENV"
-
-            SUMMARY_PATH="${test_dir}/working_dir/50_Outputs/$image_name/executive_summary/template.pdf"
-            if [ -f "$SUMMARY_PATH" ]; then
-              SUMMARY_URL="$BLOB_DIR/executive_summary/template.pdf"
-              echo "summary-url=$SUMMARY_URL"
-              echo "summary-url=$SUMMARY_URL" >> "$GITHUB_OUTPUT"
-              echo "summary-url=$SUMMARY_URL" >> "$GITHUB_ENV"
-            fi
+          REPORT_URL="$BLOB_DIR/report/index.html"
+          echo "report-url=$REPORT_URL"
+          echo "report-url=$REPORT_URL" >> "$GITHUB_OUTPUT"
+          echo "report-url=$REPORT_URL" >> "$GITHUB_ENV"
+
+          SUMMARY_PATH="${test_dir}/working_dir/50_Outputs/$image_name/executive_summary/template.pdf"
+          if [ -f "$SUMMARY_PATH" ]; then
+            SUMMARY_URL="$BLOB_DIR/executive_summary/template.pdf"
+            echo "summary-url=$SUMMARY_URL"
+            echo "summary-url=$SUMMARY_URL" >> "$GITHUB_OUTPUT"
+            echo "summary-url=$SUMMARY_URL" >> "$GITHUB_ENV"
           fi
 
       - name: Prepare comment artifact
         id: prepare-artifact
         env:
-          blob_dir: ${{ env.blob-dir }}
+          blob_dir: ${{ steps.export-outputs.outputs.blob-dir }}
           commit_time: ${{ github.event.pull_request.updated_at }}
           full_image_name: ${{ needs.docker-build.outputs.full-image-name }}
           git_sha: ${{ github.event.pull_request.head.sha }},
@@ -533,9 +524,9 @@ jobs:
           peer_group: ${{ matrix.peer_group }}
           project_code: ${{ needs.read-config.outputs.project-code }}
           registry: ${{ inputs.registry }}
-          report_url: ${{ env.report-url }}
+          report_url: ${{ steps.export-outputs.outputs.report-url }}
           run_attempt: ${{ github.run_attempt }}
-          summary_url: ${{ env.summary-url }}
+          summary_url: ${{ steps.export-outputs.outputs.summary-url }}
         run: |
           mkdir -p /tmp/comment-json
           unique_string=

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@add_real_estate, 
     RMI-PACTA/pacta.portfolio.utils
 Depends: 
     R (>= 3.5.0)

build/config/rmi_pacta_2023q4_pa2024ch.json

@@ -2,7 +2,7 @@
   "data_share_path": "2023Q4_20240718T150252Z",
   "pacta_data_quarter": "2023Q4",
   "project_code": "PA2024CH",
-  "templates_ref": "",
+  "templates_ref": "add_real_estate",
   "peer_results": "https://pactadatadev.blob.core.windows.net/project-files/pa2024ch/peer_files",
   "net_zero_targets": "https://pactadatadev.blob.core.windows.net/project-files/pa2024ch/fin_data_net_zero_targets.csv",
   "test_matrix": {
@@ -14,7 +14,7 @@
         "user_id": 74,
         "language": "DE",
         "peer_group": "bank",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/bank"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/bank"
       },
       {
         "user_id": 74,
@@ -25,7 +25,7 @@
         "user_id": 74,
         "language": "FR",
         "peer_group": "bank",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/bank"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/bank"
       },
       {
         "user_id": 74,
@@ -34,22 +34,22 @@
       },
       {
         "peer_group": "assetmanager",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/assetmanager"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/assetmanager"
       },
       {
         "peer_group": "bank",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/bank"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/bank"
       },
       {
         "peer_group": "insurance",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/insurance"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/insurance"
       },
       {
         "peer_group": "pensionfund",
-        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240702/pensionfund"
+        "user_results": "https://pactadatadev.blob.core.windows.net/testing-files/user-results/PA2024CH_peer-test/20240927/pensionfund"
       }
     ]
   },
   "resultsDestinationURL": "https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-full",
-  "reportsDestinationURL": "https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-reports-private"
+  "reportsDestinationURL": "https://pactadatadev.blob.core.windows.net/ghactions-workflow-transition-monitor-results-reports"
 }