This is an automated email from the ASF dual-hosted git repository. weizhou pushed a commit to branch 4.18-enable-sonar-check-by-label in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 71aa17b9b05f80eb9f71f0fa3bb4b1cefb73b230 Author: Wei Zhou <[email protected]> AuthorDate: Tue Aug 22 09:53:06 2023 +0200 .github: run Sonar only if PR has label ready-for-sonar-check --- .github/workflows/sonar-check.yml | 5 ++++- .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 1 + .../resource/wrapper/xenbase/CitrixStartCommandWrapper.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml index 196cbc93e36..fc4cf6e654b 100644 --- a/.github/workflows/sonar-check.yml +++ b/.github/workflows/sonar-check.yml @@ -17,7 +17,9 @@ name: Sonar Quality Check -on: [pull_request] +on: + pull_request_target: + types: [labeled] permissions: contents: read @@ -31,6 +33,7 @@ jobs: if: github.repository == 'apache/cloudstack' name: Sonar JaCoCo Coverage runs-on: ubuntu-22.04 + if: contains(github.event.pull_request.labels.*.name, 'status:ready-for-sonar-check') steps: - uses: actions/checkout@v3 with: diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 7fcf8858469..f557a97bfb2 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -1199,6 +1199,7 @@ public abstract class CitrixResourceBase extends ServerResourceBase implements S vbdr.mode = Types.VbdMode.RO; vbdr.type = Types.VbdType.CD; vbdr.userdevice = String.valueOf(USER_DEVICE_START_ID + isoCount); + s_logger.debug("Wei vdbr = " + vbdr.toMap()); } else { vbdr.mode = Types.VbdMode.RW; vbdr.type = Types.VbdType.DISK; diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java index ad76b7f4541..bc4383d2454 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java @@ -241,12 +241,17 @@ public final class CitrixStartCommandWrapper extends CommandWrapper<StartCommand List<DiskTO> disks = new ArrayList<DiskTO>(vmSpec.getDisks().length); int index = 0; for (final DiskTO disk : vmSpec.getDisks()) { + s_logger.debug("====== Wei disks index = " + index); if (Volume.Type.ISO.equals(disk.getType())) { disks.add(0, disk); } else { disks.add(index, disk); } index++; + for (DiskTO newDisk: disks) { + s_logger.debug("Wei newDisk type = " + newDisk.getType()); + s_logger.debug("Wei newDisk path = " + newDisk.getPath()); + } } int isoCount = 0; for (DiskTO disk : disks) {
