Skip to content

Merge master into py3 for coveralls #5776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
c0aedf9
CP-47304: [Toolstack] - Add data model for anti-affinity group
BengangY Apr 18, 2024
92d51d8
UT - CP-47655: [Toolstack] - Associate/disassociate VM to/from anti-a…
BengangY Apr 18, 2024
55a5916
Merge pull request #5546 from BengangY/private/bengangy/CP-47304
robhoes Apr 18, 2024
2c920ed
CA-391880: Update related field 'groups' of VM when destroying VM group.
BengangY Apr 19, 2024
81a05a0
Merge pull request #5573 from BengangY/private/bengangy/CA-391880
robhoes Apr 22, 2024
1425790
CP-47302: VM start with anti-affinity
BengangY Apr 25, 2024
0de00ba
CP-47302: UT for VM start with anti-affinity
BengangY Apr 25, 2024
aeac4cc
Merge pull request #5577 from BengangY/private/bengangy/CP-47302
robhoes Apr 25, 2024
a77d149
Merge branch 'master' into feature/vm-anti-affinity
Apr 26, 2024
8a6c4c8
Merge pull request #5594 from gangj/feature/vm-anti-affinity
robhoes Apr 26, 2024
506fb31
CA-392177: Keep current group after reverting from snapshot
BengangY Apr 28, 2024
3bf62b7
Merge pull request #5598 from BengangY/private/bengangy/CA-392177
robhoes Apr 29, 2024
b9ae796
Merge branch 'master' into feature/vm-anti-affinity
May 1, 2024
8505ed1
Merge pull request #5607 from gangj/feature/vm-anti-affinity
robhoes May 1, 2024
69c8aaf
CP-47656 Anti-affinity feature - resolve cycle dependency issue
LunfanZhang Apr 29, 2024
22259d0
CP-47656 Anti-affinity feature generate alert
LunfanZhang Apr 29, 2024
da8ad7f
Merge pull request #5605 from LunfanZhang/private/luzhan_official/CP-…
gangj May 13, 2024
ab19a9c
CP-48570: Add a field 'recommendations' in pool
BengangY May 21, 2024
1f9d39e
CP-48570: Load recommendations from config file when Xapi starts
BengangY May 21, 2024
d03febe
Merge pull request #5637 from BengangY/private/bengangy/CP-48570
minglumlu May 23, 2024
606423e
CP-48011: Xapi Support anti-affinity feature flag
BengangY Apr 30, 2024
6529c0b
Merge pull request #5631 from BengangY/private/bengangy/CP-48011-review
minglumlu May 29, 2024
7fcef06
CA-393421: Special VMs cannot be added to VM groups
BengangY May 28, 2024
5a8614f
Merge branch 'master' into feature/vm-anti-affinity
May 30, 2024
3dc2b9e
Merge pull request #5658 from gangj/private/gangj/merge_from_master
robhoes May 30, 2024
1efaf1f
CP-48625: Code refactoring
May 16, 2024
d1316f1
CP-48625: Code refactoring
May 16, 2024
eaf7945
opam: add psq to xapi dependencies
May 23, 2024
6640b38
Merge pull request #5653 from BengangY/private/bengangy/CA-393421
robhoes May 30, 2024
25fa2eb
CP-49665: Anti-affinity support for host evacuation
May 16, 2024
fcbab2b
CP-48752: Update UT
Apr 2, 2024
c626cdb
CP-48752: Add UT for host evacuation with anti-affinity support
May 29, 2024
d9c6535
Merge pull request #5652 from gangj/private/gangj/CP-48625.Psq
minglumlu Jun 3, 2024
8a9074f
CP-48011: Xapi Support anti-affinity feature flag
BengangY Jun 3, 2024
de580e5
Merge pull request #5666 from BengangY/private/bengangy/CP-48011
robhoes Jun 3, 2024
6078991
Merge master into feature/vm-anti-affinity
BengangY Jun 19, 2024
6cd2d82
Merge pull request #5708 from BengangY/feature/vm-anti-affinity
psafont Jun 19, 2024
f25cee6
CA-394169: Allow task to have permissions on itself
GabrielBuica Jun 18, 2024
43571e7
CI: use new version of codecov action
psafont Jun 25, 2024
bbdceb3
Merge .codecov.yml from feature/py3 to drop scripts checks
bernhardkaindl Jun 26, 2024
5bd9b86
Merge pull request #5734 from psafont/upcodecov
psafont Jun 26, 2024
1493e28
CP-50055 Add Go SDK as a release package in XAPI
acefei Jun 27, 2024
5e4fddd
CI: codecov is unstable, use coveralls
bernhardkaindl Jun 26, 2024
7687e07
CA-394921: Ignore unkown properties during Java SDK deserialisation
danilo-delbusso Jun 27, 2024
47d3cb7
Merge pull request #5746 from psafont/codecov-fallback
psafont Jun 27, 2024
2a018d7
CP-49446: expose SR health values to Python
MarkSymsCtx Jun 26, 2024
2aa6076
Merge pull request #5745 from acefei/private/feis/CP-50055
psafont Jun 27, 2024
d768dd6
Merge pull request #5747 from MarkSymsCtx/CP-49446
psafont Jun 27, 2024
92c198d
opam: record correct authorship for stdext packages
psafont Jun 21, 2024
836e2d8
IH-628: add new package clock for timekeeping
psafont Jun 21, 2024
9c8011b
xapi-stdext-date: move implementation to clock package
psafont Jun 21, 2024
3341cc1
IH-628, clock: add timer module
psafont Jun 21, 2024
0174595
IH-628: remove deadlines from timers
psafont Jun 24, 2024
e06ce37
log: add pretty printer module
psafont Aug 7, 2023
c1bcd74
xapi_globs: add duration type for arguments
psafont Jun 26, 2024
d75ded9
clock/date: Note procedence of the weekday algorithm
psafont Jun 26, 2024
6ef7a5e
Merge pull request #5749 from danilo-delbusso/bug/forwards-compatibil…
kc284 Jun 28, 2024
b256bef
Merge pull request #5724 from psafont/private/paus/timeshares
psafont Jun 28, 2024
30e51bf
Make: install library clock
psafont Jun 28, 2024
6f7a7f1
Merge pull request #5752 from psafont/install-clock
psafont Jun 28, 2024
ba0c8fc
doc: remaining API docs
robhoes Jun 7, 2024
ee420f8
doc: add XenAPI release info
robhoes Jun 28, 2024
10468d7
Printf.kprintf is deprecated, replace with Printf.ksprintf
edwintorok Jun 28, 2024
f226aaa
Fix misplaced inline attributes
edwintorok Jun 28, 2024
20845fc
Merge pull request #5755 from edwintorok/private/edvint/deprecated
psafont Jul 1, 2024
f5e35fd
CP-50050 track CBT status for SMAPIv3 SRs
Jun 27, 2024
7a71865
Merge pull request #5753 from robhoes/docs
robhoes Jul 1, 2024
31eeb93
CP-49953: Remove parse_uri, switch to using Uri module instead
Jun 25, 2024
6969a8a
Merge pull request #5756 from rdn32/private/rnewton/CP-50050
psafont Jul 1, 2024
f40a624
CI: Complete parallel Coveralls uploads: Finish when done
bernhardkaindl Jun 27, 2024
5e51f8e
CP-49116: Replace fingerprint in certificate DB with sha256 and sha1
snwoods Jun 25, 2024
2008661
Merge pull request #5759 from psafont/endcover
edwintorok Jul 1, 2024
f11657e
Merge pull request #5670 from snwoods/private/stevenwo/CP-49116
snwoods Jul 2, 2024
ee8e800
CI: Update endcover step to v2 to fix CI (#5763)
bernhardkaindl Jul 2, 2024
813b3b5
Merge branch 'master' into feature/vm-anti-affinity
BengangY Jul 2, 2024
3c14607
CA-386173: Update the message of WLB authentication issue
BengangY Jul 2, 2024
753a655
Revert "CP-49953: Remove parse_uri, switch to using Uri module instead"
robhoes Jul 3, 2024
01fffd5
Merge pull request #5770 from xapi-project/revert-5726-private/asulta…
robhoes Jul 3, 2024
dd9ba19
Merge pull request #5768 from BengangY/private/bengangy/CA-386173
minglumlu Jul 4, 2024
e61e0ac
Merge pull request #5765 from BengangY/private/bengangy/vm-anti-affin…
minglumlu Jul 4, 2024
7361da8
Merge branch 'master' into feature/py3
bernhardkaindl Jul 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/generate-and-build-sdks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ jobs:
name: SDK_Source_PowerShell
path: _build/install/default/xapi/sdk/powershell/*

- name: Store Go SDK Artifacts
uses: actions/upload-artifact@v4
with:
name: SDK_Artifacts_Go
path: |
_build/install/default/xapi/sdk/go/*
!_build/install/default/xapi/sdk/go/dune

- name: Trim dune cache
run: opam exec -- dune cache trim --size=2GiB

Expand Down
38 changes: 26 additions & 12 deletions .github/workflows/other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@ jobs:
env:
SKIP: no-commit-to-branch

- name: Run Pytest for python 2 and get code coverage for Codecov
- name: Run Pytest for python 2 and get code coverage
if: ${{ matrix.python-version == '2.7' }}
run: >
pip install enum future mock pytest-coverage pytest-mock &&
pytest
--cov=scripts scripts --cov-fail-under 45 -vv -rA
--cov=scripts --cov=ocaml/xcp-rrdd
scripts/ ocaml/xcp-rrdd -vv -rA
--junitxml=.git/pytest${{matrix.python-version}}.xml
--cov-report term-missing
--cov-report xml:.git/coverage${{matrix.python-version}}.xml
env:
PYTHONDEVMODE: yes

- name: Upload Python ${{matrix.python-version}} coverage report to Codecov
if: ${{ matrix.python-version != '2.7' }}
uses: codecov/codecov-action@v3
- name: Upload coverage report to Coveralls
uses: coverallsapp/github-action@v2
with:
directory: .git
files: coverage${{matrix.python-version}}.xml
env_vars: OS,PYTHON
fail_ci_if_error: false
flags: python${{matrix.python-version}}
name: coverage${{matrix.python-version}}
verbose: true
format: cobertura
files: .git/coverage${{matrix.python-version}}.xml
flag-name: python${{matrix.python-version}}
parallel: true

- uses: dciborow/action-pylint@0.1.0
if: ${{ matrix.python-version != '2.7' }}
Expand All @@ -89,6 +89,20 @@ jobs:
github_token: ${{ secrets.github_token }}
continue-on-error: true

# For coverage of 2.7 and 3.11 we upload to Coveralls in parallel mode.
# To view the Coveralls results of the PR, click on the "Details" link to the right
# of the Coveralls Logo in the Checks section of the PR.
finish-parallel-coveralls-upload:
name: Finish coverage upload
needs: python-test # run after the python-test has completed uploading coverages
runs-on: ubuntu-latest
steps:
- name: Finish the parallel coverage upload to Coveralls
uses: coverallsapp/github-action@v2
with:
parallel-finished: true
continue-on-error: true # Do not fail CI if this step fails

deprecation-test:
name: Deprecation tests
runs-on: ubuntu-22.04
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ jobs:
runs-on: ubuntu-latest
needs: [build-python, build-sdks]
steps:
- name: Retrieve Go SDK distribution artifacts
uses: actions/download-artifact@v4
with:
name: SDK_Artifacts_Go
path: sdk_go/

- name: Retrieve Python SDK distribution artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -93,12 +99,17 @@ jobs:
shell: bash
run: zip PowerShell-SDK-7.x-prerelease-unsigned.zip ./sdk_powershell_7x -r

- name: Zip Go SDK artifacts for deployment
shell: bash
run: zip Go-SDK-prerelease-unsigned.zip ./sdk_go -r

- name: Create release ${{ github.ref_name }}
shell: bash
run: |
gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes dist/* \
PowerShell-SDK-5.x-prerelease-unsigned.zip \
PowerShell-SDK-7.x-prerelease-unsigned.zip \
Go-SDK-prerelease-unsigned.zip \
libxenserver-prerelease.tar.gz libxenserver-prerelease.src.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ install: build doc sdk doc-json
message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \
xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix \
xapi-rrd xapi-inventory \
xapi-rrd xapi-inventory clock \
xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck
# docs
mkdir -p $(DESTDIR)$(DOCDIR)
Expand All @@ -278,7 +278,7 @@ uninstall:
message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \
xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix \
xapi-rrd xapi-inventory \
xapi-rrd xapi-inventory clock \
xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck

compile_flags.txt: Makefile
Expand Down
32 changes: 32 additions & 0 deletions clock.opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
synopsis: "Xapi's library for managing time"
maintainer: ["Xapi project maintainers"]
authors: ["Jonathan Ludlam" "Pau Ruiz Safont"]
license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
homepage: "https://xapi-project.github.io/"
bug-reports: "https://github.com/xapi-project/xen-api/issues"
depends: [
"dune" {>= "3.0"}
"ocaml" {>= "4.12"}
"alcotest" {with-test}
"astring"
"mtime"
"ptime"
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/xapi-project/xen-api.git"
1 change: 1 addition & 0 deletions doc/content/xen-api/classes/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title = "XenAPI Reference"
layout = "class"
type = "xenapi"
weight = 100
+++

<div>
Expand Down
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.250.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.250.0"
layout = "release"
type = "xenapi"
release = "1.250.0"
weight = 38
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.257.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.257.0"
layout = "release"
type = "xenapi"
release = "1.257.0"
weight = 37
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.271.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.271.0"
layout = "release"
type = "xenapi"
release = "1.271.0"
weight = 36
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.290.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.290.0"
layout = "release"
type = "xenapi"
release = "1.290.0"
weight = 35
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.294.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.294.0"
layout = "release"
type = "xenapi"
release = "1.294.0"
weight = 34
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.297.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.297.0"
layout = "release"
type = "xenapi"
release = "1.297.0"
weight = 33
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.298.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.298.0"
layout = "release"
type = "xenapi"
release = "1.298.0"
weight = 32
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.301.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.301.0"
layout = "release"
type = "xenapi"
release = "1.301.0"
weight = 31
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.303.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.303.0"
layout = "release"
type = "xenapi"
release = "1.303.0"
weight = 30
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.304.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.304.0"
layout = "release"
type = "xenapi"
release = "1.304.0"
weight = 29
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.307.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.307.0"
layout = "release"
type = "xenapi"
release = "1.307.0"
weight = 28
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.313.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.313.0"
layout = "release"
type = "xenapi"
release = "1.313.0"
weight = 27
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.318.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.318.0"
layout = "release"
type = "xenapi"
release = "1.318.0"
weight = 26
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/1.329.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 1.329.0"
layout = "release"
type = "xenapi"
release = "1.329.0"
weight = 25
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/21.2.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 21.2.0"
layout = "release"
type = "xenapi"
release = "21.2.0"
weight = 24
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/21.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 21.3.0"
layout = "release"
type = "xenapi"
release = "21.3.0"
weight = 23
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/21.4.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 21.4.0"
layout = "release"
type = "xenapi"
release = "21.4.0"
weight = 22
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.12.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.12.0"
layout = "release"
type = "xenapi"
release = "22.12.0"
weight = 20
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.16.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.16.0"
layout = "release"
type = "xenapi"
release = "22.16.0"
weight = 19
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.19.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.19.0"
layout = "release"
type = "xenapi"
release = "22.19.0"
weight = 18
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.20.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.20.0"
layout = "release"
type = "xenapi"
release = "22.20.0"
weight = 17
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.26.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.26.0"
layout = "release"
type = "xenapi"
release = "22.26.0"
weight = 16
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.27.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.27.0"
layout = "release"
type = "xenapi"
release = "22.27.0"
weight = 15
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.33.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.33.0"
layout = "release"
type = "xenapi"
release = "22.33.0"
weight = 14
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.37.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.37.0"
layout = "release"
type = "xenapi"
release = "22.37.0"
weight = 13
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/22.5.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 22.5.0"
layout = "release"
type = "xenapi"
release = "22.5.0"
weight = 21
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/23.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 23.1.0"
layout = "release"
type = "xenapi"
release = "23.1.0"
weight = 12
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/23.14.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 23.14.0"
layout = "release"
type = "xenapi"
release = "23.14.0"
weight = 10
+++
7 changes: 7 additions & 0 deletions doc/content/xen-api/releases/23.18.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "XAPI 23.18.0"
layout = "release"
type = "xenapi"
release = "23.18.0"
weight = 9
+++
Loading
Loading