Commit 7195918b authored by harshit aggarwal's avatar harshit aggarwal
Browse files

PR comments

parent af7698f5
Pipeline #20361 failed with stages
in 54 minutes and 56 seconds
...@@ -17,8 +17,8 @@ variables: ...@@ -17,8 +17,8 @@ variables:
AZURE_TEST_SUBDIR: testing/schema-test-core AZURE_TEST_SUBDIR: testing/schema-test-core
AZURE_DEPLOYMENTS_SUBDIR: deployments/scripts/azure AZURE_DEPLOYMENTS_SUBDIR: deployments/scripts/azure
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR: deployments/scripts AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR: deployments/scripts
INTEGRATION_TESTER: $AZURE_PRINCIPAL_ID AZURE_CLIENT_ID: $AZURE_PRINCIPAL_ID
AZURE_TESTER_SERVICEPRINCIPAL_SECRET: $AZURE_PRINCIPAL_SECRET AZURE_CLIENT_SECRET: $AZURE_PRINCIPAL_SECRET
DATA_PARTITION: opendes DATA_PARTITION: opendes
AZURE_AD_APP_RESOURCE_ID: $AZURE_APP_ID 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 AZURE_STORAGE_CONNECTION_STRING: DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net
......
...@@ -6,8 +6,8 @@ class AzureToken(object): ...@@ -6,8 +6,8 @@ class AzureToken(object):
def get_azure_id_token(self): def get_azure_id_token(self):
tenant_id = os.getenv('AZURE_TENANT_ID') tenant_id = os.getenv('AZURE_TENANT_ID')
resource_id = os.getenv('AZURE_AD_APP_RESOURCE_ID') resource_id = os.getenv('AZURE_AD_APP_RESOURCE_ID')
client_id = os.getenv('INTEGRATION_TESTER') client_id = os.getenv('AZURE_CLIENT_ID')
client_secret = os.getenv('AZURE_TESTER_SERVICEPRINCIPAL_SECRET') client_secret = os.getenv('AZURE_CLIENT_SECRET')
if tenant_id is None: if tenant_id is None:
print('Please pass tenant Id to generate token') print('Please pass tenant Id to generate token')
......
...@@ -40,15 +40,16 @@ stages: ...@@ -40,15 +40,16 @@ stages:
addToPath: true addToPath: true
architecture: 'x64' architecture: 'x64'
- task: Bash@3 - task: Bash@3
displayName: 'Deploy Schemas' displayName: 'Bootstrap Schemas'
inputs: inputs:
targetType: 'inline' targetType: 'inline'
script: | script: |
export AZURE_DEPLOYMENTS_SUBDIR=$(System.DefaultWorkingDirectory)/${{ parameters.artifactName }}/deployments/scripts/azure 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_TENANT_ID=$(AZURE_TENANT_ID)
export AZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) export AZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID)
export INTEGRATION_TESTER=$(INTEGRATION_TESTER) export AZURE_CLIENT_ID=$(INTEGRATION_TESTER)
export AZURE_TESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) export AZURE_CLIENT_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET)
export DATA_PARTITION=$(DATA_PARTITION_ID) export DATA_PARTITION=$(DATA_PARTITION_ID)
pip install -r $AZURE_DEPLOYMENTS_SUBDIR/requirements.txt pip install -r $AZURE_DEPLOYMENTS_SUBDIR/requirements.txt
......
...@@ -71,7 +71,7 @@ stages: ...@@ -71,7 +71,7 @@ stages:
serviceBase: ${{ variables.serviceName }} serviceBase: ${{ variables.serviceName }}
testingRootFolder: 'testing' testingRootFolder: 'testing'
chartPath: ${{ variables.chartPath }} chartPath: ${{ variables.chartPath }}
- template: deploy-stages.yml - template: deploy-stage.yml
parameters: parameters:
serviceName: ${{ variables.serviceName }} serviceName: ${{ variables.serviceName }}
chartPath: ${{ variables.chartPath }} chartPath: ${{ variables.chartPath }}
...@@ -84,7 +84,7 @@ stages: ...@@ -84,7 +84,7 @@ stages:
providers: providers:
- name: Azure - name: Azure
environments: ['dev'] environments: ['dev']
- template: bootstrap-task.yml - template: bootstrap-stage.yml
parameters: parameters:
serviceName: ${{ variables.serviceName }} serviceName: ${{ variables.serviceName }}
providers: providers:
......
...@@ -11,7 +11,6 @@ azure_bootstrap: ...@@ -11,7 +11,6 @@ azure_bootstrap:
- $AZURE == 'true' - $AZURE == 'true'
azure_test: azure_test:
needs: ["azure_bootstrap"]
only: only:
variables: variables:
- $AZURE == 'true' - $AZURE == 'true'
...@@ -71,7 +71,7 @@ stages: ...@@ -71,7 +71,7 @@ stages:
serviceBase: ${{ variables.serviceName }} serviceBase: ${{ variables.serviceName }}
testingRootFolder: 'testing' testingRootFolder: 'testing'
chartPath: ${{ variables.chartPath }} chartPath: ${{ variables.chartPath }}
- template: deploy-stages.yml - template: deploy-stage.yml
parameters: parameters:
serviceName: ${{ variables.serviceName }} serviceName: ${{ variables.serviceName }}
chartPath: ${{ variables.chartPath }} chartPath: ${{ variables.chartPath }}
...@@ -84,7 +84,7 @@ stages: ...@@ -84,7 +84,7 @@ stages:
providers: providers:
- name: Azure - name: Azure
environments: ['demo'] environments: ['demo']
- template: bootstrap-task.yml - template: bootstrap-stage.yml
parameters: parameters:
serviceName: ${{ variables.serviceName }} serviceName: ${{ variables.serviceName }}
providers: providers:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment