Merging changes made in v3.8.3.4 into experimental branch.

.gitignore

@@ -38,9 +38,15 @@ Webapp/SDAF/bin
 Webapp/SDAF/Properties/PublishProfiles
 Webapp/.vs/ProjectEvaluation
 Webapp/SDAF/Properties/ServiceDependencies
+Webapp/.npmrc
 
 # Ignore OS files         - MKD 20221221
 **/.DS_Store
 
+# Additional files to ignore
+owners.txt
+NuGet.config
+
 # Ignore Python cache directories
 __pycache__
+

CONTRIBUTING.md

@@ -14,6 +14,8 @@
 Thanks for taking the time to contribute!
 This document summarizes the deployment principles which govern our project.
 
+:exclamation: All pull requests are required to be submitted against `experimental` branch.
+
 ## Building 'in the open'
 
 - Our users appreciate the transparency of our project; in this context, building "in the open" means that anyone can:

deploy/ansible/roles-sap/3.3-bom-processing/tasks/bom_processor.yaml

@@ -73,17 +73,27 @@
 
 # Download Files
 # ------------------<DEBUGGING>-------------------
-- name:                                "3.3 BoM Processing: - List files"
-  ansible.builtin.debug:
-    msg:
-      - "URL : {{ sapbits_location_base_path }}/{{ sapbits_bom_files }}/archives/{{ item.archive }}\
-               {% if sapbits_sas_token is not undefined %}?{{ sapbits_sas_token }}{% endif %}"
-      - "DEST: {{ target_media_location }}/{% if item.filename is undefined %}{{ item.archive }}{% else %}{{ item.filename }}{% endif %}"
-      - "MODE: {% if item.permissions is undefined %}0644{% else %}{{ item.permissions }}{% endif %}"
-    verbosity:                         2
-  loop:       "{{ bom.materials.media | flatten(levels=1) }}"
-  when:
-    - item.download is undefined or item.download
+- name:                                "3.3 BoM Processing: - List files and check if dynamic BOM download was performed successfully."
+  block:
+    - name:                             "Check if the item has dynamic property"
+      ansible.builtin.fail:
+        msg:                            "INSTALL:0023:Error while donwloading BOM contents. Invalid BOM structure detected."
+      when:
+        - item.download is undefined or item.download
+        - item.dynamic is defined or item.archive is undefined
+      loop:       "{{ bom.materials.media | flatten(levels=1) }}"
+
+    - name:                             "3.3 BoM Processing: - List files"
+      ansible.builtin.debug:
+        msg:
+          - "URL : {{ sapbits_location_base_path }}/{{ sapbits_bom_files }}/archives/{{ item.archive }}\
+                  {% if sapbits_sas_token is not undefined %}?{{ sapbits_sas_token }}{% endif %}"
+          - "DEST: {{ target_media_location }}/{% if item.filename is undefined %}{{ item.archive }}{% else %}{{ item.filename }}{% endif %}"
+          - "MODE: {% if item.permissions is undefined %}0644{% else %}{{ item.permissions }}{% endif %}"
+        verbosity:                         2
+      loop:       "{{ bom.materials.media | flatten(levels=1) }}"
+      when:
+        - item.download is undefined or item.download
 # ------------------</DEBUGGING>------------------
 
 - name:                                "3.3 BoM Processing: - Set Python version {{ distribution_id }}"

deploy/ansible/roles-sap/windows/3.3-bom-processing/tasks/bom_processor.yaml

@@ -78,17 +78,27 @@
 
 # Download Files
 # ------------------<DEBUGGING>-------------------
-- name:                                "3.3 BoM Processing: - List files"
-  ansible.builtin.debug:
-    msg:
-      - "URL : {{ sapbits_location_base_path }}/{{ sapbits_bom_files }}/archives/{{ item.archive }}\
-               {% if sapbits_sas_token is not undefined %}?{{ sapbits_sas_token }}{% endif %}"
-      - "DEST: {{ target_media_location }}/{% if item.filename is undefined %}{{ item.archive }}{% else %}{{ item.filename }}{% endif %}"
-      - "MODE: {% if item.permissions is undefined %}0644{% else %}{{ item.permissions }}{% endif %}"
-    verbosity:                         2
-  loop:       "{{ bom.materials.media | flatten(levels=1) }}"
-  when:
-    - item.download is undefined or item.download
+- name:                                "3.3 BoM Processing: - List files and check if dynamic BOM download was performed successfully."
+  block:
+    - name:                             "Check if the item has dynamic property"
+      ansible.builtin.fail:
+        msg:                            "INSTALL:0023:Error while donwloading BOM contents. Invalid BOM structure detected."
+      when:
+        - item.download is undefined or item.download
+        - item.dynamic is defined or item.archive is undefined
+      loop:       "{{ bom.materials.media | flatten(levels=1) }}"
+
+    - name:                                "3.3 BoM Processing: - List files"
+      ansible.builtin.debug:
+        msg:
+          - "URL : {{ sapbits_location_base_path }}/{{ sapbits_bom_files }}/archives/{{ item.archive }}\
+                  {% if sapbits_sas_token is not undefined %}?{{ sapbits_sas_token }}{% endif %}"
+          - "DEST: {{ target_media_location }}/{% if item.filename is undefined %}{{ item.archive }}{% else %}{{ item.filename }}{% endif %}"
+          - "MODE: {% if item.permissions is undefined %}0644{% else %}{{ item.permissions }}{% endif %}"
+        verbosity:                         2
+      loop:       "{{ bom.materials.media | flatten(levels=1) }}"
+      when:
+        - item.download is undefined or item.download
 # ------------------</DEBUGGING>------------------
 
 - name:                                "3.3 BoM Processing: - Creates temporary download directory"

deploy/pipelines/02-sap-workload-zone.yaml

@@ -215,8 +215,8 @@ stages:
                   "FRSO") LOCATION_IN_FILENAME="francesouth" ;;
                   "GENO") LOCATION_IN_FILENAME="germanynorth" ;;
                   "GEWC") LOCATION_IN_FILENAME="germanywest" ;;
-                  "JAEA") LOCATION_IN_FILENAME="japaneastst" ;;
-                  "JAWE") LOCATION_IN_FILENAME="japanwestst" ;;
+                  "JAEA") LOCATION_IN_FILENAME="japaneast" ;;
+                  "JAWE") LOCATION_IN_FILENAME="japanwest" ;;
                   "JINC") LOCATION_IN_FILENAME="jioindiacentral" ;;
                   "JINW") LOCATION_IN_FILENAME="jioindiawest" ;;
                   "GENO") LOCATION_IN_FILENAME="germanynorth" ;;