[CDF-23166] ADO pipelines to use containers containers (#1174)

* Updated Py SDK * ADO on Docker * adding variable group directives --------- Co-authored-by: Anders Albert <[email protected]>
cognitedata · Nov 6, 2024 · 7fd3f67 · 7fd3f67
1 parent fcc92e6
commit 7fd3f67
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 61 deletions.
diff --git a/cognite_toolkit/_repo_files/AzureDevOps/.devops/deploy-pipeline.yml b/cognite_toolkit/_repo_files/AzureDevOps/.devops/deploy-pipeline.yml
@@ -3,40 +3,27 @@ trigger:
     include:
       - main
 
-jobs:
-- job: DeployModules
-  displayName: 'Deploy to Dev'
-  pool:
-    vmImage: 'ubuntu-latest'
-  container:
-    image: cognite/toolkit:0.3.1
-  variables: 
-    - group: 'dev-toolkit-credentials'
-  steps:
-    - checkout: self
-      clean: true
+variables: 
+  - group: 'dev-toolkit-credentials'
+
 
-    # Uncomment the following lines to enable statistics
-    # - script:
-    #     cdf collect opt-in
-    #   displayName: 'Enable statistics'
-
-    - script: |
-        cdf build
-      displayName: 'Build the modules'
-      env:
-        CDF_CLUSTER: $(CDF_CLUSTER)
-        CDF_PROJECT: $(CDF_PROJECT)
-        IDP_CLIENT_ID: $(IDP_CLIENT_ID)
-        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET)
-        IDP_TENANT_ID: $(IDP_TENANT_ID)
 
-    - script: |
-        cdf deploy 
-      displayName: 'Deploy the modules'
+jobs:
+  - job: build_modules
+    displayName: 'Deploy Dry Run'
+    pool:
+      vmImage: 'ubuntu-latest'
+    container: 
+      image: 'cognite/toolkit:0.3.7'
       env:
         CDF_CLUSTER: $(CDF_CLUSTER)
         CDF_PROJECT: $(CDF_PROJECT)
         IDP_CLIENT_ID: $(IDP_CLIENT_ID)
-        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET)
-        IDP_TENANT_ID: $(IDP_TENANT_ID)
+        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET) # Make sure this is stored as a secret in Azure DevOps
+        IDP_TENANT_ID: $(IDP_TENANT_ID)
+    steps:
+      - checkout: self
+      - script: cdf build
+        displayName: 'Build the modules'
+      - script: cdf deploy
+        displayName: 'Deploy the modules'
diff --git a/cognite_toolkit/_repo_files/AzureDevOps/.devops/dry-run-pipeline.yml b/cognite_toolkit/_repo_files/AzureDevOps/.devops/dry-run-pipeline.yml
@@ -5,35 +5,27 @@ pr:
     include:
       - '*'
 
+
+variables: 
+ - group: 'dev-toolkit-credentials'
+
+
 jobs:
-- job: DeployModules
-  displayName: 'Dry-run test in Dev'
-  pool:
-    vmImage: 'ubuntu-latest'
-  container:
-    image: cognite/toolkit:0.3.1
-  variables: 
-    - group: 'dev-toolkit-credentials'
-  steps:
-    - checkout: self
-      clean: true
-
-    - script: |
-        cdf build
-      displayName: 'Build the modules'
+  - job: build_modules
+    displayName: 'Deploy Dry Run'
+    pool:
+      vmImage: 'ubuntu-latest'
+    container: 
+      image: 'cognite/toolkit:0.3.7'
       env:
         CDF_CLUSTER: $(CDF_CLUSTER)
         CDF_PROJECT: $(CDF_PROJECT)
         IDP_CLIENT_ID: $(IDP_CLIENT_ID)
-        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET)
+        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET) # Make sure this is stored as a secret in Azure DevOps
         IDP_TENANT_ID: $(IDP_TENANT_ID)
-
-    - script: |
-        cdf deploy --dry-run
-      displayName: 'Deploy the modules'
-      env:
-        CDF_CLUSTER: $(CDF_CLUSTER)
-        CDF_PROJECT: $(CDF_PROJECT)
-        IDP_CLIENT_ID: $(IDP_CLIENT_ID)
-        IDP_CLIENT_SECRET: $(IDP_CLIENT_SECRET)
-        IDP_TENANT_ID: $(IDP_TENANT_ID)
+    steps:
+      - checkout: self
+      - script: cdf build
+        displayName: 'Build the modules'
+      - script: cdf deploy --dry-run
+        displayName: 'Dry Run the modules deployment'
diff --git a/poetry.lock b/poetry.lock