Merge pull request PixarAnimationStudios#229 from autodesk-forks/adsk…

…/internal-only/feature/pipeline_adsk

Re-Enable test TfSafeOutputFile

Jenkinsfile

@@ -26,8 +26,8 @@ DEPLOY_CREDENTIALS  = [$class: 'StringBinding',
 // because of user input to a model window, path problems, etc. These need to be fixed.
 // timeout - to avoid potential test hangs, e.g. testUsdImagingGL without proper fixes
 // -R - a regular expression used to list desired tests rather than all tests (TBD)
-// TODO: Figure out why TfSafeOutputFile is failed on macOS12 and re-enable it
-USDTESTINGFLAGS     = "-E \"testUsdviewNavigationKeys|TfSafeOutputFile\" --timeout 60"
+// Note:　'|' can be used to specify multiple patterns, such as -E, -R
+USDTESTINGFLAGS     = "-E \"testUsdviewNavigationKeys\" --timeout 60"
 
 // Necessary flags to pass to build_usd.py
 USDBUILDINGFLAGS    = "--materialx --ptex --openvdb --tests --build-args USD,\"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF -DPXR_USE_PYTHON_3=ON\""
@@ -107,7 +107,6 @@ def macNode(platform) {
   node('OGS_Mac') {
     try {
       withEnv(["WORKSPACE_ON_NODE=${env.WORKSPACE}",
-               "PATH+PY=/Library/Frameworks/Python.framework/Versions/3.9/bin",
                "PYTHONBIN=python3"]) {
         checkoutStage('mac')
 
@@ -445,22 +444,23 @@ def windowsTest(buildInfo) {
     call cd /d ${buildInfo.USDgen_build_usd} && ctest -C ${buildInfo.CMakeConfig} ${USDTESTINGFLAGS}
     """
 
-  // Rerun failed case to eliminate unstable cases
-  def LastTestsFailed = "${buildInfo.USDgen_build_usd}\\Testing\\Temporary\\LastTestsFailed.log"
-  if (fileExists("${LastTestsFailed}")) {
-    bat """
-      call set PATH=%PATH%;${buildInfo.USDinst}\\lib;${buildInfo.USDinst}\\bin;${buildInfo.USDinst}\\share\\usd\\examples\\plugin;
-      call set PYTHONPATH=${buildInfo.USDinst}\\lib\\python
-      call cd /d ${buildInfo.USDgen_build_usd} && ctest -C ${buildInfo.CMakeConfig} ${USDTESTINGFLAGS} --rerun-failed
-      """
-  }
+  // Comment out for now because LastTestsFailed.log won't be removed if cases rerun pass
+  // TODO: Enable the rerun log and figure out the correct way to detect test failures
+  // // Rerun failed case to eliminate unstable cases
+  // def LastTestsFailed = "${buildInfo.USDgen_build_usd}\\Testing\\Temporary\\LastTestsFailed.log"
+  // if (fileExists("${LastTestsFailed}")) {
+  //   bat """
+  //     call set PATH=%PATH%;${buildInfo.USDinst}\\lib;${buildInfo.USDinst}\\bin;${buildInfo.USDinst}\\share\\usd\\examples\\plugin;
+  //     call set PYTHONPATH=${buildInfo.USDinst}\\lib\\python
+  //     call cd /d ${buildInfo.USDgen_build_usd} && ctest -C ${buildInfo.CMakeConfig} ${USDTESTINGFLAGS} --rerun-failed
+  //     """
+  // }
 }
 
 def macTest(buildInfo) {
   sh """
     export PATH=$PATH:${buildInfo.USDinst}/lib:
     PYTHONPATH=${buildInfo.USDinst}/lib/python:
-    LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.9/lib:
     cd ${buildInfo.USDgen_build_usd} && ctest -C ${buildInfo.CMakeConfig} ${USDTESTINGFLAGS}
     """
 }