diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 59bf38f0..9f7a3733 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -6,8 +6,8 @@ jobs: strategy: maxParallel: 4 matrix: - windows_7: - template: windows_7 + windows_10: + template: windows_10 steps: - bash: | wget -nv -nc -O packer_1.6.0_darwin_amd64.zip https://releases.hashicorp.com/packer/1.6.0/packer_1.6.0_darwin_amd64.zip @@ -28,9 +28,6 @@ jobs: sysctl -a | grep mem df -h . displayName: Dump software version - - bash: | - wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O $(Agent.BuildDirectory)/virtio-win.iso - displayName: Download virtio-win iso - bash: | # Set PACKER_LOG to 1 to troubleshoot infrastructure issues # export PACKER_LOG=1 @@ -38,5 +35,5 @@ jobs: # See https://github.com/ansible/ansible/issues/49207 # See https://github.com/ansible/ansible/issues/32499 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - packer build --only=virtualbox-iso --var virtio_win_iso=$(Agent.BuildDirectory)/virtio-win.iso $(template).json + packer build --only=virtualbox-iso --var memory_size=6144 --var disk_size=30720 $(template).json displayName: Build box \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6aabf827..ad88015f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: bionic jobs: include: - - env: PROVIDER=qemu TEMPLATE=windows_7 VIRT_GROUP=kvm + - env: PROVIDER=qemu TEMPLATE=windows_10 VIRT_GROUP=kvm install: # Install Packer. Travis ships with Packer 1.3, which is fairly old @@ -43,4 +43,4 @@ script: - wget -nv -nc https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso -O ~/virtio-win.iso - export PACKER_LOG=1 # See here https://github.com/travis-ci/travis-ci/issues/1839 for background on the sudo sudo command -- sudo -E su $USER -c 'packer build --only=${PROVIDER} --var virtio_win_iso=~/virtio-win.iso ${TEMPLATE}.json' \ No newline at end of file +- sudo -E su $USER -c 'packer build --only=${PROVIDER} --var virtio_win_iso=~/virtio-win.iso --var memory_size=6144 --var disk_size=30720 ${TEMPLATE}.json' \ No newline at end of file