From c1c216dd2b24c4e98aa1bb26887d190df102454f Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Wed, 17 Jul 2024 18:13:47 -0400 Subject: [PATCH] Use ProxMox for builds Signed-off-by: Michael Jackson --- .azure/pipelines/azure-pipelines.yml | 62 +++++++++++---- .github/{workflows => disabled}/linux.yml | 0 .github/{workflows => disabled}/macos.yml | 0 .github/{workflows => disabled}/windows.yml | 0 CMakePresets.json | 86 +++++++++++++++++++++ 5 files changed, 132 insertions(+), 16 deletions(-) rename .github/{workflows => disabled}/linux.yml (100%) rename .github/{workflows => disabled}/macos.yml (100%) rename .github/{workflows => disabled}/windows.yml (100%) diff --git a/.azure/pipelines/azure-pipelines.yml b/.azure/pipelines/azure-pipelines.yml index f96c9ad2f0..29b20b918f 100644 --- a/.azure/pipelines/azure-pipelines.yml +++ b/.azure/pipelines/azure-pipelines.yml @@ -14,6 +14,14 @@ resources: type: github endpoint: BlueQuartzSoftware name: BlueQuartzSoftware/simplnx + - repository: FileStore + type: github + endpoint: BlueQuartzSoftware + name: BlueQuartzSoftware/FileStore + - repository: SimplnxReview + type: github + endpoint: BlueQuartzSoftware + name: BlueQuartzSoftware/SimplnxReview trigger: - develop @@ -22,25 +30,25 @@ jobs: - job: strategy: matrix: - macOS: - imageName: Darwin - preset_name: ci-macos-x64 - home_dir: /Users/buildbot - Windows: + # macOS-OoC: + # imageName: Darwin + # preset_name: ci-macos-x64 + # home_dir: /Users/buildbot + Windows-OoC: imageName: Windows_NT - preset_name: ci-windows-v143 + preset_name: ci-windows-v143-ooc home_dir: C:/Users/buildbot - Linux: + Linux-OoC: imageName: Linux - preset_name: ci-linux-x64 + preset_name: ci-linux-x64-ooc home_dir: /home/buildbot - python_dir: /opt/hostedtoolcache/Python/3.10.13/x64/bin + python_dir: /opt/local/anaconda3/envs/dream3d/bin pool: name: BlueQuartz Self Hosted demands: - Agent.OS -equals $(imageName) - - BQ.SIMPLNX + - BQ.PROXMOX workspace: clean: all @@ -48,7 +56,9 @@ jobs: timeoutInMinutes: 120 variables: - simplnx_source_dir: $(Build.Repository.LocalPath) + simplnx_source_dir: $(Build.Repository.LocalPath)/simplnx + filestore_source_dir: $(Build.Repository.LocalPath)/FileStore + simplnx_review_source_dir: $(Build.Repository.LocalPath)/SimplnxReview dream3d_data_dir: $(Agent.WorkFolder)/DREAM3D_Data model_type: Experimental build_type: Release @@ -58,6 +68,10 @@ jobs: steps: - checkout: self submodules: true + - checkout: FileStore + submodules: true + - checkout: SimplnxReview + submodules: true - powershell: | try { @@ -81,13 +95,29 @@ jobs: # This also allows CDash to get the real git commit that we are on for DREAM3DNX #================================================================================================== - powershell: | - cd $(Build.Repository.LocalPath) + cd $(Build.Repository.LocalPath)/simplnx git config core.sshCommand "ssh -i $(home_dir)/.ssh/id_rsa" git remote rename origin azure git remote add origin ssh://git@github.com/$(simplnx_origin_name)/simplnx git fetch origin displayName: Update Simplnx Repo - + + - powershell: | + cd $(Build.Repository.LocalPath)/FileStore + git config core.sshCommand "ssh -i $(home_dir)/.ssh/id_rsa" + git remote rename origin azure + git remote add origin ssh://git@github.com/$(simplnx_origin_name)/FileStore + git fetch origin + displayName: Update FileStore Repo + + - powershell: | + cd $(Build.Repository.LocalPath)/SimplnxReview + git config core.sshCommand "ssh -i $(home_dir)/.ssh/id_rsa" + git remote rename origin azure + git remote add origin ssh://git@github.com/$(simplnx_origin_name)/SimplnxReview + git fetch origin + displayName: Update SimplnxReview Repo + #================================================================================================== # CDash Section: # In this section we are going to call `ctest` 3 times in order to separate out the output from @@ -99,17 +129,17 @@ jobs: $UpdatedPath = '$(python_dir)' + [IO.Path]::PathSeparator + [System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Process) [System.Environment]::SetEnvironmentVariable('PATH', $UpdatedPath, [System.EnvironmentVariableTarget]::Process) cd $(Build.BinariesDirectory) - ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/.azure/azure_ci_configure.cmake + ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/simplnx/.azure/azure_ci_configure.cmake displayName: CDash Update/Configure - powershell: | cd $(Build.BinariesDirectory) - ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/.azure/azure_ci_build.cmake + ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/simplnx/.azure/azure_ci_build.cmake displayName: CDash Build - powershell: | cd $(Build.BinariesDirectory) - ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/.azure/azure_ci_test.cmake + ctest -VV -DCTEST_SOURCE_DIR=$(simplnx_source_dir) -DCTEST_BINARY_DIRECTORY=$(Build.BinariesDirectory) -Ddashboard_model=Experimental -DCTEST_DASHBOARD_ROOT=$(Build.Repository.LocalPath) -DCMAKE_PRESET_NAME="$(preset_name)" -DCTEST_CONFIGURATION_TYPE=Release -S $(Build.Repository.LocalPath)/simplnx/.azure/azure_ci_test.cmake displayName: CDash Test #================================================================================================== diff --git a/.github/workflows/linux.yml b/.github/disabled/linux.yml similarity index 100% rename from .github/workflows/linux.yml rename to .github/disabled/linux.yml diff --git a/.github/workflows/macos.yml b/.github/disabled/macos.yml similarity index 100% rename from .github/workflows/macos.yml rename to .github/disabled/macos.yml diff --git a/.github/workflows/windows.yml b/.github/disabled/windows.yml similarity index 100% rename from .github/workflows/windows.yml rename to .github/disabled/windows.yml diff --git a/CMakePresets.json b/CMakePresets.json index ebe7e3c4e5..cd11395a42 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -194,6 +194,92 @@ } } }, + { + "name": "ci-windows-v143-ooc", + "displayName": "ci-windows-v143-ooc", + "description": "Build configuration for Azure Out-of-Core builds", + "generator": "Visual Studio 17 2022", + "inherits": "ci", + "cacheVariables": { + "VCPKG_TARGET_TRIPLET": { + "type": "STRING", + "value": "x64-windows-v143" + }, + "VCPKG_HOST_TRIPLET": { + "type": "STRING", + "value": "x64-windows-v143" + }, + "VCPKG_MANIFEST_FEATURES": { + "type": "STRING", + "value": "python;tests;parallel;itk;ebsd;compressors" + }, + "SIMPLNX_ENABLE_COMPRESSORS": { + "type": "BOOL", + "value": "ON" + }, + "SIMPLNX_EXTRA_PLUGINS": { + "type": "STRING", + "value": "FileStore;SimplnxReview" + }, + "SIMPLNX_FORCE_OUT_OF_CORE_DATA": { + "type": "BOOL", + "value": "ON" + }, + "SIMPLNX_SimplnxReview_SOURCE_DIR": { + "type": "PATH", + "value": "${sourceDir}/SimplnxReview" + }, + "SIMPLNX_FileStore_SOURCE_DIR": { + "type": "PATH", + "value": "${sourceDir}/FileStore" + } + } + }, + { + "name": "ci-linux-x64-ooc", + "displayName": "ci-linux-x64-ooc", + "description": "Build configuration for Azure Out-of-Core builds", + "generator": "Ninja", + "inherits": "ci", + "cacheVariables": { + "VCPKG_TARGET_TRIPLET": { + "type": "STRING", + "value": "x64-linux-dynamic" + }, + "VCPKG_HOST_TRIPLET": { + "type": "STRING", + "value": "x64-linux-dynamic" + }, + "Python3_EXECUTABLE": { + "type": "PATH", + "value": "/opt/local/anaconda3/envs/dream3d/bin/python" + }, + "VCPKG_MANIFEST_FEATURES": { + "type": "STRING", + "value": "python;tests;parallel;itk;ebsd;compressors" + }, + "SIMPLNX_ENABLE_COMPRESSORS": { + "type": "BOOL", + "value": "ON" + }, + "SIMPLNX_EXTRA_PLUGINS": { + "type": "STRING", + "value": "FileStore;SimplnxReview" + }, + "SIMPLNX_FORCE_OUT_OF_CORE_DATA": { + "type": "BOOL", + "value": "ON" + }, + "SIMPLNX_SimplnxReview_SOURCE_DIR": { + "type": "PATH", + "value": "${sourceDir}/SimplnxReview" + }, + "SIMPLNX_FileStore_SOURCE_DIR": { + "type": "PATH", + "value": "${sourceDir}/FileStore" + } + } + }, { "name": "conda", "generator": "Ninja",