Skip to content
Snippets Groups Projects
Commit 5fa54faa authored by Akshat  Joshi's avatar Akshat Joshi
Browse files

resolve merge conflicts

parents 99680ba7 2f9d50e0
No related branches found
No related tags found
No related merge requests found
FROM msosdu.azurecr.io/data-seed-base:v1
FROM msosdu.azurecr.io/data-seed-base:v2
ENV AZURE_BUILD_SUBDIR="provider/schema-azure" \
AZURE_TEST_SUBDIR="testing/schema-test-core" \
AZURE_DEPLOYMENTS_SUBDIR="deployments/scripts/azure" \
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR="deployments/scripts" \
AZURE_DNS_NAME=$AZURE_DNS_NAME \
AZURE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net"
AZURE_DNS_NAME=$AZURE_DNS_NAME
USER root
......
......@@ -100,7 +100,7 @@ class DeploySharedSchemas:
is_error, message, method = self.__evaluate_response(response)
if is_error:
message = 'Error with kind {}: Message: {}'.format(kind, message)
message = 'Error with kind {}: Message: {} and Status {}'.format(kind, message, response.status_code)
print(message)
messages.append(message)
elif method == self.SUCCESS:
......
......@@ -12,8 +12,7 @@ ENV DATA_PARTITION="opendes" \
AZURE_TEST_SUBDIR="testing/schema-test-core" \
AZURE_DEPLOYMENTS_SUBDIR="deployments/scripts/azure" \
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR="deployments/scripts" \
AZURE_DNS_NAME=$AZURE_DNS_NAME \
AZURE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=https;AccountName=${AZURE_BASE}data;AccountKey=${AZURE_STORAGE_KEY};EndpointSuffix=core.windows.net"
AZURE_DNS_NAME=$AZURE_DNS_NAME
USER root
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment