fix CI for windows and use jenkins artifacst for wheels (NVIDIAGameWo…

…rks#766) Signed-off-by: Clement Fuji Tsang <[email protected]>
muses0229 · Nov 23, 2023 · 396c9d0 · 396c9d0
1 parent e7c97f7
commit 396c9d0
Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/ci/gitlab_jenkins_templates/ubuntu_custom_build_CI.jenkins b/ci/gitlab_jenkins_templates/ubuntu_custom_build_CI.jenkins
@@ -98,8 +98,8 @@ spec:
                   """
                 }
                 pythonVerTag = pythonVer.split('\\.').join('')
-                Integer pythonVerTagVal = pythonVerTag
-                pythonVerAbiTag = (pythonVerTagVal < 38) ? pythonVerTag + 'm' : pythonVerTag
+                Integer MinorVal = pythonVer.split('\\.')[1].toInteger()
+                pythonVerAbiTag = (MinorVal < 8) ? pythonVerTag + 'm' : pythonVerTag
                 kaolinVer = sh(script: "cat ./version.txt", returnStdout: true).trim()
                 baseWheelName = "kaolin-${kaolinVer}-cp${pythonVerTag}-cp${pythonVerAbiTag}"
                 wheelName = "${baseWheelName}-linux_x86_64.whl"
@@ -116,9 +116,12 @@ spec:
               stage("Push wheel to volume") {
                 sh """
                 mkdir -p /mount_binaries/whl/torch-${torchVer}_cu${cudaTag}
-                mv ./${wheelName} /mount_binaries/whl/torch-${torchVer}_cu${cudaTag}/${wheelName}
+                cp ./${wheelName} /mount_binaries/whl/torch-${torchVer}_cu${cudaTag}/${wheelName}
                 """
               }
+              stage("Push wheel to artifact") {
+                archiveArtifacts artifacts: "${wheelName}"
+              }
             }
             stage("Push") {
               targetImage.push()

diff --git a/ci/gitlab_jenkins_templates/windows_wheels_CI.jenkins b/ci/gitlab_jenkins_templates/windows_wheels_CI.jenkins
@@ -16,7 +16,7 @@ currentBuild.description = sourceBranch + ": " + commitHash
 
 gitlabCommitStatus("test-${configName}") {
 
-podTemplate(cloud:'sc-ipp-blossom-prod', 
+podTemplate(cloud:'sc-ipp-blossom-116',
 slaveConnectTimeout: 4000,
 yaml: """
 apiVersion: v1
@@ -28,7 +28,7 @@ spec:
       claimName: 'kaolin-pvc'
   containers:
   - name: jnlp
-    image: jenkins/jnlp-agent:latest-windows
+    image: urm.nvidia.com/sw-ipp-blossom-sre-docker-local/jnlp-agent:jdk11-windows
     env:
     - name: JENKINS_AGENT_WORKDIR
       value: C:/Jenkins/agent
@@ -41,7 +41,7 @@ spec:
       - mountPath: c:/mnt
         name: pvc-mount
   imagePullSecrets:
-  - name: gitlabregcred
+  - name: gitlabcred
   nodeSelector:
     kubernetes.io/os: windows
 """
@@ -70,6 +70,14 @@ spec:
             }
           }
         }
+        stage("Push wheels on artifacts") {
+          catchError(stageResults: "failure") {
+            powershell '''
+            cp /tmp/kaolin-*.whl .
+            '''
+            archiveArtifacts artifacts: "kaolin-*.whl"
+          }
+        }
       }
     }
   }

diff --git a/tools/windows/Dockerfile b/tools/windows/Dockerfile
@@ -3,8 +3,6 @@
 
 FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019
 
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 # set up conda and python environment
 ARG CUDA_VERSION=11.1
 ENV CUDA_VERSION=${CUDA_VERSION}

diff --git a/tools/windows/Dockerfile.install_wheel b/tools/windows/Dockerfile.install_wheel
@@ -4,8 +4,6 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 RUN python setup.py bdist_wheel --dist-dir /tmp
 
 WORKDIR /tmp