Revert to main branch

Azure · Jan 5, 2023 · 52efca0 · 52efca0
1 parent 2af4eb3
commit 52efca0
Show file tree

Hide file tree

Showing 10 changed files with 285 additions and 293 deletions.
diff --git a/classical/aml-cli-v2/mlops/github-actions/deploy-batch-endpoint-pipeline-classical.yml b/classical/aml-cli-v2/mlops/github-actions/deploy-batch-endpoint-pipeline-classical.yml
@@ -22,12 +22,12 @@ jobs:
           echo "config-file=$config_env" >> $GITHUB_OUTPUT;
   get-config:
     needs: set-env-branch
-    uses: Azure/mlops-templates/.github/workflows/read-yaml.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/read-yaml.yml@main
     with:
       file_name: ${{ needs.set-env-branch.outputs.config-file}}
   create-compute:
     needs: get-config
-    uses: Azure/mlops-templates/.github/workflows/create-compute.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/create-compute.yml@main
     with:
       cluster_name: batch-cluster
       size: STANDARD_DS3_V2
@@ -40,7 +40,7 @@ jobs:
       creds: ${{secrets.AZURE_CREDENTIALS}}
   create-endpoint:
     needs: [get-config, create-compute]
-    uses: Azure/mlops-templates/.github/workflows/create-endpoint.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/create-endpoint.yml@main
     with:
       resource_group: ${{ needs.get-config.outputs.resource_group }}
       workspace_name: ${{ needs.get-config.outputs.aml_workspace }}
@@ -50,7 +50,7 @@ jobs:
     secrets:
       creds: ${{secrets.AZURE_CREDENTIALS}}
   create-deployment:
-    uses: Azure/mlops-templates/.github/workflows/create-deployment.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/create-deployment.yml@main
     needs: [get-config, create-endpoint]
     with:
       resource_group: ${{ needs.get-config.outputs.resource_group }}

diff --git a/classical/aml-cli-v2/mlops/github-actions/deploy-online-endpoint-pipeline-classical.yml b/classical/aml-cli-v2/mlops/github-actions/deploy-online-endpoint-pipeline-classical.yml
@@ -22,12 +22,12 @@ jobs:
           echo "config-file=$config_env" >> $GITHUB_OUTPUT;
   get-config:
     needs: set-env-branch
-    uses: Azure/mlops-templates/.github/workflows/read-yaml.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/read-yaml.yml@main
     with:
       file_name: ${{ needs.set-env-branch.outputs.config-file}}
   create-endpoint:
     needs: get-config
-    uses: Azure/mlops-templates/.github/workflows/create-endpoint.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/create-endpoint.yml@main
     with:
       resource_group: ${{ needs.get-config.outputs.resource_group }}
       workspace_name: ${{ needs.get-config.outputs.aml_workspace }}
@@ -37,7 +37,7 @@ jobs:
     secrets:
       creds: ${{secrets.AZURE_CREDENTIALS}}
   create-deployment:
-    uses: Azure/mlops-templates/.github/workflows/create-deployment.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/create-deployment.yml@main
     needs: [get-config, create-endpoint]
     with:
       resource_group: ${{ needs.get-config.outputs.resource_group }}
@@ -49,7 +49,7 @@ jobs:
     secrets:
       creds: ${{secrets.AZURE_CREDENTIALS}}
   allocate-traffic:
-    uses: Azure/mlops-templates/.github/workflows/allocate-traffic.yml@main-dec31 # TODO - revert to @main
+    uses: Azure/mlops-templates/.github/workflows/allocate-traffic.yml@main
     needs: [get-config, create-deployment]
     with:
       resource_group: ${{ needs.get-config.outputs.resource_group }}

diff --git a/classical/python-sdk-v2/mlops/devops-pipelines/deploy-batch-endpoint-pipeline.yml b/classical/python-sdk-v2/mlops/devops-pipelines/deploy-batch-endpoint-pipeline.yml
@@ -2,67 +2,65 @@
 # Licensed under the MIT License.
 
 variables:
-- ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
-    # 'main' branch: PRD environment
-    - template: ../../config-infra-prod.yml
-- ${{ if ne(variables['Build.SourceBranchName'], 'main') }}:  
-    # 'develop' or feature branches: DEV environment
-    - template: ../../config-infra-dev.yml
-- name: version
-  value: python-sdk-v2 
-- name: endpoint_name
-  value: taxi-batch-$(namespace)$(postfix)$(environment)
+  - ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
+      # 'main' branch: PRD environment
+      - template: ../../config-infra-prod.yml
+  - ${{ if ne(variables['Build.SourceBranchName'], 'main') }}:
+      # 'develop' or feature branches: DEV environment
+      - template: ../../config-infra-dev.yml
+  - name: version
+    value: python-sdk-v2
+  - name: endpoint_name
+    value: taxi-batch-$(namespace)$(postfix)$(environment)
 
 trigger:
-- none
+  - none
 
 pool:
   vmImage: ubuntu-20.04
 
-
 resources:
   repositories:
-    - repository: mlops-templates  # Template Repo
+    - repository: mlops-templates # Template Repo
       name: Azure/mlops-templates # need to change org name from "Azure" to your own org
       endpoint: github-connection # need to set up and hardcode
       type: github
-      ref: main-dec31
-
+      ref: main
 
 stages:
-- stage: CreateBatchEndpoint
-  displayName: Create/Update Batch Endpoint 
-  jobs:
-    - job: DeployBatchEndpoint
-      steps:
-      - checkout: self
-        path: s/
-      - checkout: mlops-templates
-        path: s/templates/
-      - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
-      - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
-      - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
-      - template: templates/aml-cli-v2/create-compute.yml@mlops-templates
-        parameters:
-          cluster_name: batch-cluster # name must match cluster name in deployment file below
-          size: STANDARD_DS3_V2
-          min_instances: 0
-          max_instances: 5
-          cluster_tier: dedicated
-      - template: templates/${{ variables.version }}/create-batch-endpoint.yml@mlops-templates
-        parameters: 
-          endpoint_name: "${{ variables.endpoint_name }}"
-          endpoint_description: "Taxi batch endpoint"
-          auth_mode: "aad_token"
-      - template: templates/${{ variables.version }}/create-batch-deployment.yml@mlops-templates
-        parameters:
-          deployment_name: taxi-batch-dp
-          deployment_description: "Taxi batch deployment"
-          endpoint_name: "${{ variables.endpoint_name }}"
-          model_path: "taxi-model@latest"
-          compute: batch-cluster
-      - template: templates/${{ variables.version }}/test-batch-endpoint.yml@mlops-templates
-        parameters:
-          endpoint_name: "${{ variables.endpoint_name }}"
-          sample_request: data/taxi-batch.csv
-          request_type: uri_file #either uri_folder or uri_file 
+  - stage: CreateBatchEndpoint
+    displayName: Create/Update Batch Endpoint
+    jobs:
+      - job: DeployBatchEndpoint
+        steps:
+          - checkout: self
+            path: s/
+          - checkout: mlops-templates
+            path: s/templates/
+          - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
+          - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
+          - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
+          - template: templates/aml-cli-v2/create-compute.yml@mlops-templates
+            parameters:
+              cluster_name: batch-cluster # name must match cluster name in deployment file below
+              size: STANDARD_DS3_V2
+              min_instances: 0
+              max_instances: 5
+              cluster_tier: dedicated
+          - template: templates/${{ variables.version }}/create-batch-endpoint.yml@mlops-templates
+            parameters:
+              endpoint_name: "${{ variables.endpoint_name }}"
+              endpoint_description: "Taxi batch endpoint"
+              auth_mode: "aad_token"
+          - template: templates/${{ variables.version }}/create-batch-deployment.yml@mlops-templates
+            parameters:
+              deployment_name: taxi-batch-dp
+              deployment_description: "Taxi batch deployment"
+              endpoint_name: "${{ variables.endpoint_name }}"
+              model_path: "taxi-model@latest"
+              compute: batch-cluster
+          - template: templates/${{ variables.version }}/test-batch-endpoint.yml@mlops-templates
+            parameters:
+              endpoint_name: "${{ variables.endpoint_name }}"
+              sample_request: data/taxi-batch.csv
+              request_type: uri_file #either uri_folder or uri_file
diff --git a/classical/python-sdk-v2/mlops/devops-pipelines/deploy-model-training-pipeline.yml b/classical/python-sdk-v2/mlops/devops-pipelines/deploy-model-training-pipeline.yml
@@ -23,48 +23,48 @@ resources:
       name: Azure/mlops-templates # need to change org name from "Azure" to your own org
       endpoint: github-connection # need to set up and hardcode
       type: github
-      ref: main-dec31
+      ref: main
 
 stages:
-- stage: DeployTrainingPipeline
-  displayName: Deploy Training Pipeline
-  jobs:
-    - job: DeployTrainingPipeline
-      timeoutInMinutes: 120 # how long to run the job before automatically cancelling
-      steps:
-      - checkout: self
-        path: s/
-      - checkout: mlops-templates
-        path: s/templates/
-      - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
-      - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
-      - template: templates/python-sdk-v2/install-requirements.yml@mlops-templates
-      - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
-      - template: templates/aml-cli-v2/create-compute.yml@mlops-templates
-        parameters:
-          cluster_name: cpu-cluster
-          size: Standard_DS3_v2
-          min_instances: 0
-          max_instances: 4
-          cluster_tier: low_priority
-      - template: templates/${{ variables.version }}/register-environment.yml@mlops-templates
-        parameters:
-          environment_name: taxi-train-env
-          environment_description: "Training Environment for Taxi Pipeline"
-          environment_path: data-science/environment/train-conda.yml
-          build_type: conda
-      - template: templates/${{ variables.version }}/register-data-asset.yml@mlops-templates
-        parameters:
-          data_name: taxi-data
-          data_description: taxi-training-dataset
-          data_path: data/taxi-data.csv
-          data_type: uri_file
-      - template: templates/${{ variables.version }}/run-pipeline.yml@mlops-templates
-        parameters: 
-          pipeline_path: mlops/azureml/train/run_pipeline.py
-          experiment_name: taxi-train-pipeline
-          data_name: taxi-data
-          environment_name: taxi-train-env
-          compute_name: cpu-cluster
-          enable_monitoring: $(enable_monitoring)
-          table_name: 'taximonitoring'
+  - stage: DeployTrainingPipeline
+    displayName: Deploy Training Pipeline
+    jobs:
+      - job: DeployTrainingPipeline
+        timeoutInMinutes: 120 # how long to run the job before automatically cancelling
+        steps:
+          - checkout: self
+            path: s/
+          - checkout: mlops-templates
+            path: s/templates/
+          - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
+          - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
+          - template: templates/python-sdk-v2/install-requirements.yml@mlops-templates
+          - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
+          - template: templates/aml-cli-v2/create-compute.yml@mlops-templates
+            parameters:
+              cluster_name: cpu-cluster
+              size: Standard_DS3_v2
+              min_instances: 0
+              max_instances: 4
+              cluster_tier: low_priority
+          - template: templates/${{ variables.version }}/register-environment.yml@mlops-templates
+            parameters:
+              environment_name: taxi-train-env
+              environment_description: "Training Environment for Taxi Pipeline"
+              environment_path: data-science/environment/train-conda.yml
+              build_type: conda
+          - template: templates/${{ variables.version }}/register-data-asset.yml@mlops-templates
+            parameters:
+              data_name: taxi-data
+              data_description: taxi-training-dataset
+              data_path: data/taxi-data.csv
+              data_type: uri_file
+          - template: templates/${{ variables.version }}/run-pipeline.yml@mlops-templates
+            parameters:
+              pipeline_path: mlops/azureml/train/run_pipeline.py
+              experiment_name: taxi-train-pipeline
+              data_name: taxi-data
+              environment_name: taxi-train-env
+              compute_name: cpu-cluster
+              enable_monitoring: $(enable_monitoring)
+              table_name: "taximonitoring"
diff --git a/classical/python-sdk-v2/mlops/devops-pipelines/deploy-online-endpoint-pipeline.yml b/classical/python-sdk-v2/mlops/devops-pipelines/deploy-online-endpoint-pipeline.yml
@@ -2,57 +2,56 @@
 # Licensed under the MIT License.
 
 variables:
-- ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
-    # 'main' branch: PRD environment
-    - template: ../../config-infra-prod.yml
-- ${{ if ne(variables['Build.SourceBranchName'], 'main') }}:  
-    # 'develop' or feature branches: DEV environment
-    - template: ../../config-infra-dev.yml
-- name: version
-  value: python-sdk-v2
-- name: endpoint_name
-  value: taxi-online-$(namespace)$(postfix)$(environment)
+  - ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
+      # 'main' branch: PRD environment
+      - template: ../../config-infra-prod.yml
+  - ${{ if ne(variables['Build.SourceBranchName'], 'main') }}:
+      # 'develop' or feature branches: DEV environment
+      - template: ../../config-infra-dev.yml
+  - name: version
+    value: python-sdk-v2
+  - name: endpoint_name
+    value: taxi-online-$(namespace)$(postfix)$(environment)
 
 trigger:
-- none
+  - none
 
 pool:
   vmImage: ubuntu-20.04
 
-
 resources:
   repositories:
-    - repository: mlops-templates  # Template Repo
+    - repository: mlops-templates # Template Repo
       name: Azure/mlops-templates # need to change org name from "Azure" to your own org
       endpoint: github-connection # need to set up and hardcode
       type: github
-      ref: main-dec31
+      ref: main
 
 stages:
-- stage: CreateOnlineEndpoint
-  displayName: Create/Update Online Endpoint 
-  jobs:
-    - job: DeployOnlineEndpoint
-      steps:
-      - checkout: self
-        path: s/
-      - checkout: mlops-templates
-        path: s/templates/
-      - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
-      - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
-      - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
-      - template: templates/${{ variables.version }}/create-online-endpoint.yml@mlops-templates
-        parameters:
-          endpoint_name: "${{ variables.endpoint_name }}"
-          endpoint_description: "Taxi Online Endpoint"
-          auth_mode: "aml_token"
-      - template: templates/${{ variables.version }}/create-online-deployment.yml@mlops-templates
-        parameters:
-          deployment_name: taxi-online-dp
-          endpoint_name: "${{ variables.endpoint_name }}"
-          model_path: "taxi-model@latest"
-          traffic_allocation: 100
-      - template: templates/${{ variables.version }}/test-online-endpoint.yml@mlops-templates
-        parameters:
-          endpoint_name: "${{ variables.endpoint_name }}"
-          sample_request: data/taxi-request.json
+  - stage: CreateOnlineEndpoint
+    displayName: Create/Update Online Endpoint
+    jobs:
+      - job: DeployOnlineEndpoint
+        steps:
+          - checkout: self
+            path: s/
+          - checkout: mlops-templates
+            path: s/templates/
+          - template: templates/aml-cli-v2/install-az-cli.yml@mlops-templates
+          - template: templates/aml-cli-v2/install-aml-cli.yml@mlops-templates
+          - template: templates/aml-cli-v2/connect-to-workspace.yml@mlops-templates
+          - template: templates/${{ variables.version }}/create-online-endpoint.yml@mlops-templates
+            parameters:
+              endpoint_name: "${{ variables.endpoint_name }}"
+              endpoint_description: "Taxi Online Endpoint"
+              auth_mode: "aml_token"
+          - template: templates/${{ variables.version }}/create-online-deployment.yml@mlops-templates
+            parameters:
+              deployment_name: taxi-online-dp
+              endpoint_name: "${{ variables.endpoint_name }}"
+              model_path: "taxi-model@latest"
+              traffic_allocation: 100
+          - template: templates/${{ variables.version }}/test-online-endpoint.yml@mlops-templates
+            parameters:
+              endpoint_name: "${{ variables.endpoint_name }}"
+              sample_request: data/taxi-request.json