CP-46060/Py3: (Local Pytests) rebased on merge of master into feature/py3

.git-blame-ignore-revs

@@ -29,6 +29,7 @@ b020cf35a1f2c274f95a4118d4596043cba6113f
 ff39018fd6d91985f9c893a56928771dfe9fa48d
 cbb9edb17dfd122c591beb14d1275acc39492335
 d6ab15362548b8fe270bd14d5153b8d94e1b15c0
+b12cf444edea15da6274975e1b2ca6a7fce2a090
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

.github/workflows/1.249-lcm.yml

@@ -15,7 +15,7 @@ jobs:
         test: ["", "-3"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: '1.249-lcm'
 
@@ -25,54 +25,43 @@ jobs:
   ocaml-test:
     name: Ocaml tests
     runs-on: ubuntu-20.04
-    env:
-      package: "xapi-cli-protocol xapi-client xapi-consts xapi-database xapi-datamodel xapi-types xapi xe"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: '1.249-lcm'
 
+      - name: Free space
+        shell: bash
+        run: sudo rm -rf /usr/local/lib/android
+
       - name: Pull configuration from xs-opam
         run: |
           curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/release/yangtze/lcm/tools/xs-opam-ci.env | cut -f2 -d " " > .env
 
       - name: Load environment file
         id: dotenv
-        uses: falti/dotenv-action@v1.0.2
-
-      - name: Retrieve date for cache key (year-week)
-        id: cache-key
-        run: echo "date=$(/bin/date -u "+%Y%W")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Restore opam cache
-        id: opam-cache
-        uses: actions/cache@v3
-        with:
-          path: "~/.opam"
-          # invalidate cache every week, gets built using a scheduled job
-          key: ${{ steps.cache-key.outputs.date }}-1.249
+        uses: falti/dotenv-action@v1
 
       - name: Update Ubuntu repositories
+        shell: bash
         run: sudo apt-get update
 
       - name: Use ocaml
-        uses: avsm/setup-ocaml@v1
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ steps.dotenv.outputs.ocaml_version_full }}
-          opam-repository: ${{ steps.dotenv.outputs.repository }}
+          ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
+          opam-repositories: |
+            xs-opam: ${{ steps.dotenv.outputs.repository }}
+          dune-cache: true
 
       - name: Install dependencies
-        run: |
-          opam update
-          opam pin add . --no-action
-          opam depext -u ${{ env.package }}
-          opam upgrade
-          opam install ${{ env.package }} --deps-only --with-test -v
+        shell: bash
+        run: opam install . --deps-only --with-test -v
 
-      - name: Build
+      - name: Configure and build
+        shell: bash
         run: |
           opam exec -- ./configure
           opam exec -- make
@@ -85,4 +74,4 @@ jobs:
       - name: Avoid built packages to appear in the cache
         # only packages in this repository follow a branch, the rest point
         # to a tag
-        run: opam uninstall ${{ env.package }}
+        run: opam pin list --short | xargs opam unpin

.github/workflows/docs.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Pull configuration from xs-opam
         run: |
@@ -43,7 +43,7 @@ jobs:
           opam exec -- dune exec ocaml/xapi-storage/generator/src/main.exe -- gen_markdown --path=$STORAGE_DOCDIR
 
       - name: Deploy xapi-storage docs
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.ACTIONS_STORAGE_DEPLOY_KEY }}
           publish_dir: ${{ env.STORAGE_DOCDIR }}

.github/workflows/format.yml

@@ -14,15 +14,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Pull configuration from xs-opam
         run: |
           curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env | cut -f2 -d " " > .env
 
       - name: Load environment file
         id: dotenv
-        uses: falti/dotenv-action@v1.0.4
+        uses: falti/dotenv-action@v1
 
       - name: Update Ubuntu repositories
         run: sudo apt-get update

.github/workflows/generate-and-build-sdks.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup XenAPI environment
         uses: ./.github/workflows/setup-xapi-environment
@@ -24,20 +24,54 @@ jobs:
         shell: bash
         run: opam exec -- make sdk
 
+      - name: Store C SDK source
+        uses: actions/upload-artifact@v4
+        with:
+          name: SDK_Source_C
+          path: |
+            _build/install/default/xapi/sdk/c/*
+            !_build/install/default/xapi/sdk/c/dune
+
       - name: Store C# SDK source
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SDK_Source_CSharp
           path: _build/install/default/xapi/sdk/csharp/*
 
       - name: Store PowerShell SDK source
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SDK_Source_PowerShell
           path: _build/install/default/xapi/sdk/powershell/*
 
-      - name: Cleanup XenAPI environment
-        uses: ./.github/workflows/cleanup-xapi-environment
+      - name: Trim dune cache
+        run: opam exec -- dune cache trim --size=2GiB
+
+  build-c-sdk:
+    name: Build C SDK
+    runs-on: ubuntu-latest
+    needs: generate-sdk-sources
+    steps:
+      - name: Install dependencies
+        run: sudo apt-get install libxml2-dev
+
+      - name: Retrieve C SDK source
+        uses: actions/download-artifact@v4
+        with:
+          name: SDK_Source_C
+          path: source/
+
+      - name: Build C SDK
+        shell: bash
+        run: make -C source
+
+      - name: Store C SDK
+        uses: actions/upload-artifact@v4
+        with:
+          name: SDK_Artifacts_C
+          path: |
+            source/*
+            !source/src/*.o
 
   build-csharp-sdk:
     name: Build C# SDK
@@ -49,7 +83,7 @@ jobs:
         run: echo "XAPI_VERSION_NUMBER=$("${{ inputs.xapi_version }}".TrimStart('v'))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Retrieve C# SDK source
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: SDK_Source_CSharp
           path: source/
@@ -64,7 +98,7 @@ jobs:
           --verbosity=normal
 
       - name: Store C# SDK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SDK_Binaries_CSharp
           path: source/src/bin/Release/XenServer.NET.${{ env.XAPI_VERSION_NUMBER }}-prerelease-unsigned.nupkg
@@ -81,21 +115,21 @@ jobs:
         run: echo "XAPI_VERSION_NUMBER=$("${{ inputs.xapi_version }}".TrimStart('v'))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Retrieve PowerShell SDK source
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: SDK_Source_PowerShell
           path: source/
 
       - name: Retrieve C# SDK binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: SDK_Binaries_CSharp
           path: csharp/
 
       # Following needed for restoring packages
       # when calling dotnet add package
       - name: Set up dotnet CLI (.NET 6.0 and 8.0)
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             6
@@ -135,7 +169,7 @@ jobs:
           ForEach-Object -Process { Copy-Item -Verbose $_.FullName -Destination "output" }
 
       - name: Store PowerShell SDK (.NET Framework 4.5)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SDK_Binaries_XenServerPowerShell_NET45
           path: output/**/*
@@ -155,19 +189,19 @@ jobs:
         run: echo "XAPI_VERSION_NUMBER=$("${{ inputs.xapi_version }}".TrimStart('v'))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Retrieve PowerShell SDK source
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: SDK_Source_PowerShell
           path: source/
 
       - name: Retrieve C# SDK binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: SDK_Binaries_CSharp
           path: csharp/
 
       - name: Set up dotnet CLI (.NET ${{ matrix.dotnet }})
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
 
@@ -205,7 +239,7 @@ jobs:
           ForEach-Object -Process { Copy-Item -Verbose $_.FullName -Destination "output" }
 
       - name: Store PowerShell SDK (.NET ${{ matrix.dotnet }})
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: SDK_Binaries_XenServerPowerShell_NET${{ matrix.dotnet }}
           path: output/**/*

.github/workflows/hugo.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
+        uses: peaceiris/actions-hugo@v3
         with:
           hugo-version: '0.119.0'
 
@@ -24,7 +24,7 @@ jobs:
           hugo --minify
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.ACTIONS_DOCS_DEPLOY_KEY }}
           publish_dir: ./doc/public