use one yaml

VoVAllen · May 31, 2021 · 717d8d8 · 717d8d8
1 parent 90dadb7
commit 717d8d8
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 95 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -108,7 +108,7 @@ pipeline {
     stage('Regression Test Trigger') {
       agent {
         kubernetes {
-          yamlFile 'docker/pods/ci-lint.yaml'
+          yamlFile 'docker/pods/ci-pods.yaml'
           defaultContainer 'dgl-ci-lint'
         }
       }
@@ -149,7 +149,7 @@ pipeline {
     stage('Bot Instruction') {
       agent {
         kubernetes {
-          yamlFile 'docker/pods/ci-lint.yaml'
+          yamlFile 'docker/pods/ci-pods.yaml'
           defaultContainer 'dgl-ci-lint'
         }
       }
@@ -171,7 +171,7 @@ pipeline {
         stage('Lint Check') {
           agent {
             kubernetes {
-              yamlFile 'docker/pods/ci-lint.yaml'
+              yamlFile 'docker/pods/ci-pods.yaml'
               defaultContainer 'dgl-ci-lint'
             }
           }
@@ -191,7 +191,7 @@ pipeline {
             stage('CPU Build') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-compile-cpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-cpu-compile'
                 }
               }
@@ -207,7 +207,7 @@ pipeline {
             stage('GPU Build') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-compile-gpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-gpu-compile'
                 }
               }
@@ -242,7 +242,7 @@ pipeline {
             stage('C++ CPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-cpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-cpu'
                 }
               }
@@ -269,7 +269,7 @@ pipeline {
             stage('Tensorflow CPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-cpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-cpu'
                 }
               }
@@ -289,7 +289,7 @@ pipeline {
             stage('Tensorflow GPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-gpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-gpu'
                 }
               }
@@ -309,7 +309,7 @@ pipeline {
             stage('Torch CPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-cpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-cpu'
                 }
               }
@@ -359,7 +359,7 @@ pipeline {
             stage('Torch GPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-gpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-gpu'
                 }
               }
@@ -385,7 +385,7 @@ pipeline {
             stage('MXNet CPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-cpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-cpu'
                 }
               }
@@ -410,7 +410,7 @@ pipeline {
             stage('MXNet GPU') {
               agent {
                 kubernetes {
-                  yamlFile 'docker/pods/ci-gpu.yaml'
+                  yamlFile 'docker/pods/ci-pods.yaml'
                   defaultContainer 'dgl-ci-gpu'
                 }
               }

diff --git a/docker/pods/ci-compile-cpu.yaml b/docker/pods/ci-compile-cpu.yaml
diff --git a/docker/pods/ci-compile-gpu.yaml b/docker/pods/ci-compile-gpu.yaml
diff --git a/docker/pods/ci-cpu.yaml b/docker/pods/ci-cpu.yaml
diff --git a/docker/pods/ci-gpu.yaml b/docker/pods/ci-gpu.yaml
diff --git a/docker/pods/ci-lint.yaml b/docker/pods/ci-lint.yaml
diff --git a/docker/pods/ci-pods.yaml b/docker/pods/ci-pods.yaml
@@ -0,0 +1,87 @@
+apiVersion: v1
+kind: Pod
+spec:
+  securityContext:
+    runAsUser: 0
+  containers:
+  - name: dgl-ci-cpu-compile
+    image: dgllib/dgl-ci-cpu:conda
+    imagePullPolicy: Always
+    tty: true
+    resources:
+      requests:
+        cpu: 16
+  # affinity:
+  #   nodeAffinity:
+  #     requiredDuringSchedulingIgnoredDuringExecution:
+  #       nodeSelectorTerms:
+  #       - matchExpressions:
+  #         - key: beta.kubernetes.io/instance-type
+  #           operator: In
+  #           values:
+  #           - c5.9xlarge
+---
+apiVersion: v1
+kind: Pod
+spec:
+  securityContext:
+    runAsUser: 0
+  containers:
+  - name: dgl-ci-gpu-compile
+    image: dgllib/dgl-ci-gpu:conda
+    imagePullPolicy: Always
+    tty: true
+    resources:
+      requests:
+        cpu: 32
+  # affinity:
+  #   nodeAffinity:
+  #     requiredDuringSchedulingIgnoredDuringExecution:
+  #       nodeSelectorTerms:
+  #       - matchExpressions:
+  #         - key: beta.kubernetes.io/instance-type
+  #           operator: In
+  #           values:
+  #           - c5.9xlarge
+---
+apiVersion: v1
+kind: Pod
+spec:
+  securityContext:
+    runAsUser: 0
+  containers:
+  - name: dgl-ci-cpu
+    image: dgllib/dgl-ci-cpu:conda
+    imagePullPolicy: Always
+    tty: true
+    resources:
+      requests:
+        cpu: 8
+---
+apiVersion: v1
+kind: Pod
+spec:
+  securityContext:
+    runAsUser: 0
+  containers:
+    - name: dgl-ci-gpu
+      image: dgllib/dgl-ci-gpu:conda
+      imagePullPolicy: Always
+      tty: true
+      resources:
+        limits:
+          nvidia.com/gpu: 1 # requesting 1 GPU
+---
+apiVersion: v1
+kind: Pod
+spec:
+  securityContext:
+    runAsUser: 0
+  containers:
+  - name: dgl-ci-lint
+    image: dgllib/dgl-ci-lint
+    imagePullPolicy: Always
+    tty: true
+    resources:
+      requests:
+        cpu: 4