cleanup gitlab workflow (#779)

iterative · Oct 26, 2021 · 99dce95 · 99dce95 · github-actions · Oct 26, 2021
1 parent 6f437b3
commit 99dce95
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/.github/workflows/checkbot.yml b/.github/workflows/checkbot.yml
@@ -77,21 +77,21 @@ jobs:
           cml-send-comment report.md
           cml-send-github-check report.md
 
-          cml-runner \
-            --cloud-spot \
-            --cloud azure \
-            --cloud-region eastus \
-            --cloud-type Standard_NC6 \
-            --idle-timeout 3600 \
-            --labels cml-runner-az-gpu
+          cml runner \
+              --cloud-spot \
+              --cloud=azure \
+              --cloud-region=eastus \
+              --cloud-type=Standard_NC6 \
+              --idle-timeout=3600 \
+              --labels=cml-runner-az-gpu
 
           cml-runner \
-            --cloud-spot \
-            --cloud aws \
-            --cloud-region us-west \
-            --cloud-type g2.2xlarge \
-            --idle-timeout 3600 \
-            --labels cml-runner-aws-gpu
+              --cloud-spot \
+              --cloud aws \
+              --cloud-region us-west \
+              --cloud-type g2.2xlarge \
+              --idle-timeout 3600 \
+              --labels cml-runner-aws-gpu
   test_machine_aws:
     needs: check-container
     runs-on: [self-hosted, cml-runner-aws-gpu]

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,18 +1,15 @@
-stages:
-  - deploy
-  - test
-
-deploy_job:
-  stage: deploy
-  when: always
-  image: iterativeai/cml:0-dvc2-base1-gpu
+deploy-runner:
+  image: iterativeai/cml:0-dvc2-base1
   script:
-    - cml-runner --cloud aws --cloud-region us-west --cloud-type g2.2xlarge
-      --cloud-spot --labels=cml-runner-gpu
-
-test_runner:
-  stage: test
-  when: on_success
+    - |
+      cml runner \
+          --cloud=aws \
+          --cloud-region=us-west \
+          --cloud-type=g2.2xlarge \
+          --cloud-spot \
+          --labels=cml-runner-gpu
+test-runner:
+  needs: [deploy-runner]
   tags:
     - cml-runner-gpu
   script:
@@ -23,15 +20,14 @@ test_runner:
     - npm run test
 
     - nvidia-smi
-
-test_container:
-  stage: test
-  when: on_success
+test-container:
+  needs: [deploy-runner]
   tags:
     - cml-runner-gpu
   image: iterativeai/cml:0-dvc2-base1-gpu
   script:
     - dvc --version
+    - cml --version
     - pip install tensorboard
 
     - npm ci