Compare commits

..

No commits in common. "14588591e5c8c0830f7c77e17f41ea528b9659c4" and "cf1b4778a16c0d1380fd022b46e20cec1e1f11af" have entirely different histories.

2 changed files with 23 additions and 70 deletions

View File

@ -319,101 +319,56 @@ unit_test linux/fedora/39/amd64/clang:
after_script: after_script:
- /opt/libvirt-driver/cleanup.sh - /opt/libvirt-driver/cleanup.sh
.fedora38_needs: &fedora38_needs hardware_test system-test-fedora38-red2:
<<: *hw_test
variables:
GUEST_OS_TAG: fedora38
DEVICE_PORT: ETH_A
needs: needs:
- job: build linux/fedora/38/amd64/clang - job: build linux/fedora/38/amd64/clang
artifacts: true artifacts: true
hardware_test fedora38-red2: hardware_test system-test-fedora38-vcan42:
<<: *hw_test <<: *hw_test
<<: *fedora38_needs
variables:
GUEST_OS_TAG: fedora38
DEVICE_PORT: ETH_A
hardware_test fedora38-vcan42:
<<: *hw_test
<<: *fedora38_needs
variables: variables:
GUEST_OS_TAG: fedora38 GUEST_OS_TAG: fedora38
DEVICE_PORT: USB_D DEVICE_PORT: USB_D
needs:
- job: build linux/fedora/38/amd64/clang
artifacts: true
hardware_test fedora38-fire3: hardware_test system-test-ubuntu2204-red2:
<<: *hw_test <<: *hw_test
<<: *fedora38_needs
variables: variables:
GUEST_OS_TAG: fedora38 GUEST_OS_TAG: ubuntu22.04
DEVICE_PORT: ETH_B DEVICE_PORT: ETH_A
hardware_test fedora38-vcan42-EL:
<<: *hw_test
<<: *fedora38_needs
variables:
GUEST_OS_TAG: fedora38
DEVICE_PORT: USB_C
.ubuntu2204_needs: &ubuntu2204_needs
needs: needs:
- job: build linux/ubuntu/2204/amd64/clang - job: build linux/ubuntu/2204/amd64/clang
artifacts: true artifacts: true
hardware_test ubuntu2204-red2: hardware_test system-test-ubuntu2204-vcan42:
<<: *hw_test <<: *hw_test
<<: *ubuntu2204_needs
variables:
GUEST_OS_TAG: ubuntu22.04
DEVICE_PORT: ETH_A
hardware_test ubuntu2204-vcan42:
<<: *hw_test
<<: *ubuntu2204_needs
variables: variables:
GUEST_OS_TAG: ubuntu22.04 GUEST_OS_TAG: ubuntu22.04
DEVICE_PORT: USB_D DEVICE_PORT: USB_D
needs:
- job: build linux/ubuntu/2204/amd64/clang
artifacts: true
hardware_test ubuntu2204-fire3: hardware_test system-test-win10-red2:
<<: *hw_test <<: *hw_test
<<: *ubuntu2204_needs
variables: variables:
GUEST_OS_TAG: ubuntu22.04 GUEST_OS_TAG: win10
DEVICE_PORT: ETH_B DEVICE_PORT: ETH_A
hardware_test ubuntu2204-vcan42-EL:
<<: *hw_test
<<: *ubuntu2204_needs
variables:
GUEST_OS_TAG: ubuntu22.04
DEVICE_PORT: USB_C
.win10_needs: &win10_needs
needs: needs:
- job: build windows/x64 - job: build windows/x64
artifacts: true artifacts: true
hardware_test win10-red2: hardware_test system-test-win10-vcan42:
<<: *hw_test <<: *hw_test
<<: *win10_needs
variables:
GUEST_OS_TAG: win10
DEVICE_PORT: ETH_A
hardware_test win10-vcan42:
<<: *hw_test
<<: *win10_needs
variables: variables:
GUEST_OS_TAG: win10 GUEST_OS_TAG: win10
DEVICE_PORT: USB_D DEVICE_PORT: USB_D
needs:
hardware_test win10-fire3: - job: build windows/x64
<<: *hw_test artifacts: true
<<: *win10_needs
variables:
GUEST_OS_TAG: win10
DEVICE_PORT: ETH_B
hardware_test win10-vcan42-EL:
<<: *hw_test
<<: *win10_needs
variables:
GUEST_OS_TAG: win10
DEVICE_PORT: USB_C

View File

@ -44,8 +44,6 @@ public:
bool getEthPhyRegControlSupported() const override { return true; } bool getEthPhyRegControlSupported() const override { return true; }
bool supportsTC10() const override { return true; }
protected: protected:
RADComet3(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) { RADComet3(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) {
initialize<RADComet3Settings>(makeDriver); initialize<RADComet3Settings>(makeDriver);