diff --git a/Makefile b/Makefile index 46fdbe0e..d2ce46e6 100755 --- a/Makefile +++ b/Makefile @@ -71,6 +71,12 @@ vmware: .dapper VMWARE_APPEND="console=tty1 console=ttyS0,115200n8 printk.devkmsg=on rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 panic=10" \ ./.dapper vmware-release 2>&1 | tee dist/release.log +hyperv: .dapper + mkdir -p dist + INTEGRATION_TESTS=0 \ + APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v1.5.0-rc1" \ + ./.dapper hyperv-release 2>&1 | tee dist/release.log + help: @./scripts/help diff --git a/pkg/init/hypervisor/hypervisor.go b/pkg/init/hypervisor/hypervisor.go index 2401af4d..8883d9ac 100644 --- a/pkg/init/hypervisor/hypervisor.go +++ b/pkg/init/hypervisor/hypervisor.go @@ -51,8 +51,8 @@ func enableHypervisorService(cfg *config.CloudConfig, hypervisorName string) { return } - // only enable open-vm-tools for vmware - // these services(xenhvm-vm-tools, kvm-vm-tools, hyperv-vm-tools and bhyve-vm-tools) don't exist yet + // enable open-vm-tools and hyperv-vm-tools + // these services(xenhvm-vm-tools, kvm-vm-tools, and bhyve-vm-tools) don't exist yet serviceName := "" switch hypervisorName { case "vmware": diff --git a/scripts/hyperv-release b/scripts/hyperv-release new file mode 100755 index 00000000..f5245122 --- /dev/null +++ b/scripts/hyperv-release @@ -0,0 +1,16 @@ +#!/bin/bash +set -ex + +cd $(dirname $0)/.. + + +source ./scripts/version +./scripts/release + +ISO_NAME="rancheros-autoformat.iso" + +mkdir -p /tmp/dist && mv ./dist/* /tmp/dist/ +mkdir -p ./dist/hyperv && mv /tmp/dist/* ./dist/hyperv/ +mkdir -p ./dist/artifacts && cp ./dist/hyperv/artifacts/rancheros.iso ./dist/artifacts/${ISO_NAME} +echo "gsutil cp dist/artifacts/${ISO_NAME} gs://releases.rancher.com/os/latest/hyperv/${ISO_NAME}" +echo "gsutil cp dist/artifacts/${ISO_NAME} gs://releases.rancher.com/os/${VERSION}/hyperv/${ISO_NAME}"