Skip to content

Commit 8017e46

Browse files
authored
Merge pull request #78 from ciaran28/main
Major Update To Code + Data Science/MLFlow Improvements
2 parents 5825090 + 2f13802 commit 8017e46

File tree

90 files changed

+1366
-1313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1366
-1313
lines changed

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/1-Master/onDeploy.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/1-Master/onDeploy.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/1-Master/onRelease.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/1-Master/onRelease.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/2-Jobs/jobDatabricks.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/2-Jobs/jobDatabricks.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/3-Tasks/taskDatabricks.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Managed_Identity_Auth/3-Tasks/taskDatabricks.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/1-Master/onDeploy.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/1-Master/onDeploy.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/1-Master/onRelease.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/1-Master/onRelease.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/2-Jobs/jobDatabricks.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/2-Jobs/jobDatabricks.yaml

File renamed without changes.

.azureDevOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/3-Tasks/taskDatabricks.yaml renamed to .azure_devOps-DEVELOPING_DO_NOT_USE/workflows/Service_Principal_Auth/3-Tasks/taskDatabricks.yaml

File renamed without changes.

.dbx/project.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
{
22
"environments": {
3-
"Sandbox": {
4-
"profile": "Sandbox",
3+
"sandbox": {
4+
"profile": "sandbox",
5+
"workspace_dir": "/Shared/cicd_workflows/sandbox",
56
"storage_type": "mlflow",
67
"properties": {
7-
"workspace_directory": "/Shared/cicd_workflow/sandbox",
8-
"artifact_location": "dbfs:/Shared/cicd_workflow/sandbox"
8+
"workspace_directory": "/Shared/cicd_workflows/sandbox",
9+
"artifact_location": "dbfs:/Shared/cicd_workflows/sandbox"
910
}
1011
},
11-
"Development": {
12-
"profile": "Development",
12+
"development": {
13+
"profile": "development",
1314
"workspace_dir": "/Shared/development",
14-
"artifact_location": "dbfs:/Shared/e2e_mlops/dbx/projects/development"
15+
"artifact_location": "dbfs:/Shared/cicd_workflows/development"
1516
},
16-
"UAT": {
17-
"profile": "UAT",
18-
"workspace_dir": "/Shared/uat",
19-
"artifact_location": "dbfs:/Shared/e2e_mlops/dbx/projects/uat"
17+
"uat": {
18+
"profile": "uat",
19+
"workspace_dir": "/Shared/uat/uat",
20+
"artifact_location": "dbfs:/Shared/cicd_workflows/uat"
2021
},
21-
"Production": {
22-
"profile": "Production",
22+
"production": {
23+
"profile": "production",
2324
"workspace_dir": "/Shared/production",
24-
"artifact_location": "dbfs:/Shared/e2e_mlops/dbx/projects/production"
25+
"artifact_location": "dbfs:/Shared/cicd_workflows/production"
2526
},
26-
"Ciaran_Sandbox": {
27-
"profile": "Ciaran_Sandbox",
27+
"ciaran_sandbox": {
28+
"profile": "ciaran_sandbox",
2829
"workspace_dir": "/Shared/ciaran_sandbox",
29-
"artifact_location": "dbfs:/Shared/e2e_mlops/dbx/projects/e2e_mlops_dbx_ciaran_experiments"
30+
"artifact_location": "dbfs:/Shared/cicd_workflows/ciaran_sandbox"
3031
},
3132
"default": {
32-
"profile": "DEFAULT",
33+
"profile": "default",
3334
"storage_type": "mlflow",
3435
"properties": {
35-
"workspace_directory": "/Shared/dbx/projects/dstoolkit-mlops-databricks",
36-
"artifact_location": "dbfs:/dbx/dstoolkit-mlops-databricks"
36+
"workspace_directory": "/Shared/cicd_workflows/default",
37+
"artifact_location": "dbfs:/Shared/cicd_workflows/default"
3738
}
3839
}
3940
},

.github/workflows/onDeploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Master Deployment
1717
strategy:
1818
matrix:
19-
targetEnvironment: [ Sandbox, Development] #[ Sandbox, Development, UAT, Production ]
19+
targetEnvironment: [ sandbox] #[ sandbox, development, uat, production ]
2020
uses: ./.github/workflows/taskDatabricks.yaml
2121
with:
2222
ENVIRONMENT: ${{ matrix.targetEnvironment }}

0 commit comments

Comments
 (0)