There is a security vulnerability in SSH key-generation using GitKraken < v8.0.1. If you used this tool to create SSH keys, please update GitKraken and regenerate. If you need help with this, contact forum-support@opengroup.org

Commit 540d97bc authored by harshit aggarwal's avatar harshit aggarwal Committed by Kishore Battula
Browse files

Azure - Dag pipeline changing stage order

parent a7498aa8
......@@ -39,6 +39,45 @@
# JOBS
# --------------------------------------------------------------------------------
azure_test_dag:
tags: ["osdu-medium"]
image: $CI_REGISTRY/danielscholl/azure-maven/azure-maven:v1.0
stage: integration
needs: ["compile-and-unit-test"]
variables:
AZURE_SERVICE: csv-parser
AZURE_TENANT_ID: $AZURE_TENANT_ID
KEYVAULT_URI: $AZURE_KEYVAULT_URI
partition_service_endpoint: https://${AZURE_DNS_NAME}/api/partition/v1
storage_service_endpoint: https://${AZURE_DNS_NAME}/api/storage/v2
schema_service_endpoint: https://${AZURE_DNS_NAME}/api/schema-service/v1
search_service_endpoint: https://${AZURE_DNS_NAME}/api/search/v2
unit_service_endpoint: https://${AZURE_DNS_NAME}/api/unit/v2/unit/symbol
legal_service_endpoint: https://${AZURE_DNS_NAME}/api/legal/v1
file_service_endpoint: https://${AZURE_DNS_NAME}/api/file/v2
DMS_KIND: opendes:testcsv:wellbore:1.0.0
DMS_ACL: data.default.viewers@opendes.contoso.com
DMS_LEGAL_TAG: opendes-public-usa-dataset-7643990
aad_client_id: $AZURE_APP_ID
AZURE_AD_TENANT_ID: $AZURE_TENANT_ID
AZURE_CLIENT_ID: $AZURE_PRINCIPAL_ID
AZURE_CLIENT_SECRET: $AZURE_PRINCIPAL_SECRET
AZURE_AD_APP_RESOURCE_ID: $AZURE_APP_ID
DATA_PARTITION_ID: opendes
extends:
- .azure_variables
script:
- mvn clean install -pl $AZURE_PARSER_BUILD_SUBDIR -am
- mvn clean verify -f $AZURE_TEST_SUBDIR/pom.xml
only:
variables:
- $AZURE == 'true'
except:
variables:
- $AZURE_SKIP_TEST == 'true'
# This stage generates the output dag folder by running a docker container which will
# built via Dockerfile present in DAD repository root. This Dockerfile should contain the
# logic to generate all the prerequisite artifacts for the DAG and output all the
......@@ -48,7 +87,7 @@ azure_create_dag:
tags: ["osdu-medium"]
image: danielscholl/azure-build-image
stage: containerize
needs: ["compile-and-unit-test"]
needs: ["azure_test_dag"]
variables:
PARSER_IMAGE: ${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}:${CI_COMMIT_SHA}
DAG_IMAGE: ${CI_PROJECT_NAME}-dag-${CI_COMMIT_REF_SLUG}:${CI_COMMIT_SHA}
......@@ -304,44 +343,11 @@ azure_register_dag:
- echo $BEARER_TOKEN
- python ./register_dag.py
artifacts:
paths:
- "output_dags"
only:
variables:
- $AZURE == 'true'
azure_test_dag:
tags: ["osdu-medium"]
image: $CI_REGISTRY/danielscholl/azure-maven/azure-maven:v1.0
stage: testDag
needs: ["azure_register_dag"]
variables:
AZURE_SERVICE: csv-parser
AZURE_TENANT_ID: $AZURE_TENANT_ID
KEYVAULT_URI: $AZURE_KEYVAULT_URI
partition_service_endpoint: https://${AZURE_DNS_NAME}/api/partition/v1
storage_service_endpoint: https://${AZURE_DNS_NAME}/api/storage/v2
schema_service_endpoint: https://${AZURE_DNS_NAME}/api/schema-service/v1
search_service_endpoint: https://${AZURE_DNS_NAME}/api/search/v2
unit_service_endpoint: https://${AZURE_DNS_NAME}/api/unit/v2/unit/symbol
legal_service_endpoint: https://${AZURE_DNS_NAME}/api/legal/v1
file_service_endpoint: https://${AZURE_DNS_NAME}/api/file/v2
DMS_KIND: opendes:testcsv:wellbore:1.0.0
DMS_ACL: data.default.viewers@opendes.contoso.com
DMS_LEGAL_TAG: opendes-public-usa-dataset-7643990
aad_client_id: $AZURE_APP_ID
AZURE_AD_TENANT_ID: $AZURE_TENANT_ID
AZURE_CLIENT_ID: $AZURE_PRINCIPAL_ID
AZURE_CLIENT_SECRET: $AZURE_PRINCIPAL_SECRET
AZURE_AD_APP_RESOURCE_ID: $AZURE_APP_ID
DATA_PARTITION_ID: opendes
extends:
- .azure_variables
script:
- mvn clean install -pl $AZURE_PARSER_BUILD_SUBDIR -am
- mvn clean verify -f $AZURE_TEST_SUBDIR/pom.xml
only:
variables:
- $AZURE == 'true'
except:
variables:
- $AZURE_SKIP_TEST == 'true'
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