Updating yml

deployments/scripts/azure/deploy_mappings.py

@@ -6,7 +6,7 @@ from azure.storage.blob import BlobServiceClient, BlobClient, ContainerClient
 storage_account_name = os.environ.get('AZURE_STORAGE_ACCOUNT_NAME')
 storage_account_key = os.environ.get('AZURE_STORAGE_ACCOUNT_KEY')
 storage_account_url = "https://{}.blob.core.windows.net".format(storage_account_name)
-container_name = os.environ.get('AZURE_STORAGE_CONTAINER')
+container_name = os.environ.get('AZURE_MAPPINGS_STORAGE_CONTAINER')
 blob_service_client = BlobServiceClient(account_url = storage_account_url,credential = storage_account_key)
 local_folder = os.path.join(os.path.dirname(__file__), "../../mappings/opendes")
 

devops/azure/bootstrap.yml

 .bootstrap_variables:
   variables:
-    AZURE_STORAGE_CONTAINER: osdu-wks-mappings
+    AZURE_MAPPINGS_STORAGE_CONTAINER: osdu-wks-mappings
     AZURE_COSMOS_KEY: $AZURE_COSMOS_PRIMARY_KEY
     AZURE_COSMOS_URL: $AZURE_COSMOS_CONNECTION
     AZURE_STORAGE_ACCOUNT_NAME: ${AZURE_BASE}data

devops/azure/deploy-stage.yaml

 parameters:
-  serviceName: 'wks'
+  serviceName: ''
+  chartPath: ''
   testCoreMavenPomFile: ''
-  skipDeploy: false
-  skipTest: 'false'
-  environments: []
+  valuesFile: ''
+  testCoreMavenOptions: ''
+  skipDeploy: ''
+  skipTest: ''
+  environments: ['dev']
 
 stages:
   - ${{ each environment in parameters.environments }}:
       - template: /devops/deploy-stages.yml@TemplateRepo
-        parameters:
-          serviceName: ${{ parameters.serviceName }}
-          chartPath: ${{ parameters.chartPath }}
-          valuesFile: ${{ parameters.valuesFile }}
-          testCoreMavenPomFile: ${{parameters.testCoreMavenPomFile}}
-          skipDeploy: ${{ parameters.skipDeploy }}
-          skipTest: ${{ parameters.skipTest }}
-          providers:
-            - name: Azure
-              environments:
-                - ${{ environment }}
+      parameters:
+        serviceName: ${{ parameters.serviceName }}
+        chartPath: ${{ parameters.chartPath }}
+        valuesFile: ${{ parameters.valuesFile }}
+        testCoreMavenPomFile: ${parameters.testCoreMavenPomFile}
+        testCoreMavenOptions: ${parameters.testCoreMavenOptions}
+        skipDeploy: ${{ variables.SKIP_DEPLOY }}
+        skipTest: ${{ variables.SKIP_TESTS }}
+        providers:
+          -  name: Azure
+             environments: ${{ environment }}
       - stage: 'Deploy_Azure_WKS_Mappings_${{ environment }}'
         jobs:
           - job: 'Deploy_Azure_WKS_Mappings_${{ environment }}'
@@ -44,8 +47,11 @@ stages:
                   script: |
                     pip install -r $(AZURE_DEPLOYMENTS_SUBDIR)/requirements.txt
 
-                    export STORAGE_CONTAINER=$(MAPPINGS_STORAGE_CONTAINER)
-                    export AZURE_STORAGE_ACCOUNT_NAME=$(AZURE_STORAGE_ACCOUNT_NAME)
-                    export AZURE_STORAGE_ACCOUNT_KEY=$(AZURE_STORAGE_ACCOUNT_KEY)
+                    export AZURE_MAPPINGS_STORAGE_CONTAINER=$(AZURE_MAPPINGS_STORAGE_CONTAINER)
+                    export AZURE_STORAGE_ACCOUNT_NAME=$(STORAGE_ACCOUNT)
+                    export AZURE_STORAGE_ACCOUNT_KEY=$(STORAGE_ACCOUNT_KEY)
+                    export AZURE_COSMOS_KEY=$(AZURE_COSMOS_KEY)
+                    export AZURE_COSMOS_URL=$(AZURE_COSMOS_URL)
 
-                    python $(AZURE_DEPLOYMENTS_SUBDIR)/deploy_mappings.py
\ No newline at end of file
+                    python $(AZURE_DEPLOYMENTS_SUBDIR)/deploy_mappings.py
+                    python $(AZURE_DEPLOYMENTS_SUBDIR)/deploy_mappings_info_records.py
\ No newline at end of file

devops/azure/development-pipeline.yml

@@ -68,7 +68,7 @@ stages:
       serviceBase: ${{ variables.serviceName }}
       testingRootFolder: 'testing'
       chartPath: ${{ variables.chartPath }}
-  - template: /devops/deploy-stages.yml@TemplateRepo
+  - template: /devops/deploy-stage.yml@TemplateRepo
     parameters:
       serviceName: ${{ variables.serviceName }}
       chartPath: ${{ variables.chartPath }}