PR comments

.gitlab-ci.yml

@@ -17,8 +17,8 @@ variables:
   AZURE_TEST_SUBDIR: testing/schema-test-core
   AZURE_DEPLOYMENTS_SUBDIR: deployments/scripts/azure
   AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR: deployments/scripts
-  INTEGRATION_TESTER: $AZURE_PRINCIPAL_ID
-  AZURE_TESTER_SERVICEPRINCIPAL_SECRET: $AZURE_PRINCIPAL_SECRET
+  AZURE_CLIENT_ID: $AZURE_PRINCIPAL_ID
+  AZURE_CLIENT_SECRET: $AZURE_PRINCIPAL_SECRET
   DATA_PARTITION: opendes
   AZURE_AD_APP_RESOURCE_ID: $AZURE_APP_ID
   AZURE_STORAGE_CONNECTION_STRING: DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net

deployments/scripts/azure/Token.py

@@ -6,8 +6,8 @@ class AzureToken(object):
     def get_azure_id_token(self):
         tenant_id = os.getenv('AZURE_TENANT_ID')
         resource_id = os.getenv('AZURE_AD_APP_RESOURCE_ID')
-        client_id = os.getenv('INTEGRATION_TESTER')
-        client_secret = os.getenv('AZURE_TESTER_SERVICEPRINCIPAL_SECRET')
+        client_id = os.getenv('AZURE_CLIENT_ID')
+        client_secret = os.getenv('AZURE_CLIENT_SECRET')
         
         if tenant_id is None:
             print('Please pass tenant Id to generate token')

devops/azure/bootstrap-task.yml → devops/azure/bootstrap-stage.yml

@@ -40,15 +40,16 @@ stages:
                             addToPath: true
                             architecture: 'x64'
                         - task: Bash@3
-                          displayName: 'Deploy Schemas'
+                          displayName: 'Bootstrap Schemas'
                           inputs:
                             targetType: 'inline'
                             script: |
                               export AZURE_DEPLOYMENTS_SUBDIR=$(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure
+                              # These variables are required for generating the token
                               export AZURE_TENANT_ID=$(AZURE_TENANT_ID)
                               export AZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID)
-                              export INTEGRATION_TESTER=$(INTEGRATION_TESTER)
-                              export AZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET)
+                              export AZURE_CLIENT_ID=$(INTEGRATION_TESTER)
+                              export AZURE_CLIENT_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET)
                               export DATA_PARTITION=$(DATA_PARTITION_ID)
 
                               pip install -r $AZURE_DEPLOYMENTS_SUBDIR/requirements.txt

devops/azure/development-pipeline.yml

@@ -71,7 +71,7 @@ stages:
       serviceBase: ${{ variables.serviceName }}
       testingRootFolder: 'testing'
       chartPath: ${{ variables.chartPath }}
-  - template: deploy-stages.yml
+  - template: deploy-stage.yml
     parameters:
       serviceName: ${{ variables.serviceName }}
       chartPath: ${{ variables.chartPath }}
@@ -84,7 +84,7 @@ stages:
       providers:
         -  name: Azure
            environments: ['dev']
-  - template: bootstrap-task.yml
+  - template: bootstrap-stage.yml
     parameters:
       serviceName: ${{ variables.serviceName }}
       providers:

devops/azure/gitlab-bootstrap.yml

@@ -11,7 +11,6 @@ azure_bootstrap:
       - $AZURE == 'true'
 
 azure_test:
-  needs: ["azure_bootstrap"]
   only:
     variables:
       - $AZURE == 'true'

devops/azure/pipeline.yml

@@ -71,7 +71,7 @@ stages:
       serviceBase: ${{ variables.serviceName }}
       testingRootFolder: 'testing'
       chartPath: ${{ variables.chartPath }}
-  - template: deploy-stages.yml
+  - template: deploy-stage.yml
     parameters:
       serviceName: ${{ variables.serviceName }}
       chartPath: ${{ variables.chartPath }}
@@ -84,7 +84,7 @@ stages:
       providers:
         -  name: Azure
            environments: ['demo']
-  - template: bootstrap-task.yml
+  - template: bootstrap-stage.yml
     parameters:
       serviceName: ${{ variables.serviceName }}
       providers: