Changeset View
Standalone View
release/Makefile.vm
Show All 13 Lines | |||||
VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image | VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image | ||||
VMDK_DESC= VMWare, VirtualBox disk image | VMDK_DESC= VMWare, VirtualBox disk image | ||||
QCOW2_DESC= Qemu, KVM disk image | QCOW2_DESC= Qemu, KVM disk image | ||||
RAW_DESC= Unformatted raw disk image | RAW_DESC= Unformatted raw disk image | ||||
CLOUDWARE?= BASIC-CI \ | CLOUDWARE?= BASIC-CI \ | ||||
EC2 \ | EC2 \ | ||||
GCE \ | GCE \ | ||||
OCI \ | |||||
gjb: See comment below, but please do not enable this by default yet. | |||||
Not Done Inline ActionsTo be more clear, do not enable this by default yet as I will need to add logic to thermite.sh to do the upload to OCI (with which, I will also need to have API keys/credentials for RE use). gjb: To be more clear, do not enable this by default yet as I will need to add logic to `thermite. | |||||
VAGRANT-VIRTUALBOX \ | VAGRANT-VIRTUALBOX \ | ||||
VAGRANT-VMWARE | VAGRANT-VMWARE | ||||
AZURE_FORMAT= vhdf | AZURE_FORMAT= vhdf | ||||
AZURE_DESC= Microsoft Azure platform image | AZURE_DESC= Microsoft Azure platform image | ||||
AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} | AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} | ||||
BASIC-CI_FORMAT= raw | BASIC-CI_FORMAT= raw | ||||
BASIC-CI_DESC= Image for CI | BASIC-CI_DESC= Image for CI | ||||
BASIC-CI_DISK= ${OSRELEASE}.${BASIC-CI_FORMAT} | BASIC-CI_DISK= ${OSRELEASE}.${BASIC-CI_FORMAT} | ||||
EC2_FORMAT= raw | EC2_FORMAT= raw | ||||
EC2_DESC= Amazon EC2 image | EC2_DESC= Amazon EC2 image | ||||
EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} | EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} | ||||
GCE_FORMAT= raw | GCE_FORMAT= raw | ||||
GCE_DESC= Google Compute Engine image | GCE_DESC= Google Compute Engine image | ||||
GCE_DISK= disk.${GCE_FORMAT} | GCE_DISK= disk.${GCE_FORMAT} | ||||
OCI_FORMAT= qcow2 | |||||
OCI_DESC= Oracle Cloud Infrastructure image | |||||
OCI_DISK= disk.${OCI_FORMAT} | |||||
Done Inline ActionsShould we follow naming of other image types, ${OSRELEASE}.${OCI_FORMAT} or ${OSRELEASE}.oci.${OCI_FORMAT} emaste: Should we follow naming of other image types, `${OSRELEASE}.${OCI_FORMAT}` or `${OSRELEASE}.oci. | |||||
Done Inline ActionsI think this does follow at least some of the naming schemes. Notably, EC2_DISK=${OSRELEASE}.${EC2_FORMAT}, however GCE_DISK=disk.${GCE_FORMAT}. I forget exactly why there was divergence there, to be honest. gjb: I think this does follow at least some of the naming schemes.
Notably, EC2_DISK=${OSRELEASE}. | |||||
Done Inline ActionsHuh, it looks like despite this we actually create oci.qcow2 emaste: Huh, it looks like despite this we actually create oci.qcow2 | |||||
Done Inline Actionshah I remember. GCE needs GNU tar/zip and also the image file had to be named disk.raw. Can't find the official docs but https://khushbu-parakh.medium.com/create-instances-in-google-cloud-with-private-image-328409916744 is what we need. dch: hah I remember. GCE needs GNU tar/zip and also the image file had to be named disk.raw. Can't… | |||||
OPENSTACK_FORMAT=qcow2 | OPENSTACK_FORMAT=qcow2 | ||||
OPENSTACK_DESC= OpenStack platform image | OPENSTACK_DESC= OpenStack platform image | ||||
OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT} | OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT} | ||||
VAGRANT-VIRTUALBOX_FORMAT= vmdk | VAGRANT-VIRTUALBOX_FORMAT= vmdk | ||||
VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox | VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox | ||||
VAGRANT-VIRTUALBOX_DISK= ${OSRELEASE}.vbox.${VAGRANT_FORMAT} | VAGRANT-VIRTUALBOX_DISK= ${OSRELEASE}.vbox.${VAGRANT_FORMAT} | ||||
VAGRANT-VMWARE_FORMAT= vmdk | VAGRANT-VMWARE_FORMAT= vmdk | ||||
VAGRANT-VMWARE_DESC= Vagrant Image for VMWare | VAGRANT-VMWARE_DESC= Vagrant Image for VMWare | ||||
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines | |||||
cloudware-release: | cloudware-release: | ||||
.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) | .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) | ||||
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} | ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} | ||||
.endif | .endif | ||||
.include "${.CURDIR}/Makefile.ec2" | .include "${.CURDIR}/Makefile.ec2" | ||||
.include "${.CURDIR}/Makefile.azure" | .include "${.CURDIR}/Makefile.azure" | ||||
.include "${.CURDIR}/Makefile.gce" | .include "${.CURDIR}/Makefile.gce" | ||||
# TODO write one of these when we have figured out upload | |||||
# .include "${.CURDIR}/Makefile.oci" | |||||
Done Inline ActionsI have not had a chance to take a very close look, but until these can be uncommented, I consider these two lines to be blockers. There is a similar change in the pipeline to add back support for Azure, however one of the Azure provisioning scripts changes the hostname to 'localhost.localdomain', which I will not allow to be committed until that is resolved. Orthogonal, sure, but the point being, commented, not-yet-ready functionality is a no-go as far as I am concerned. While these lines are commented, so should the 'OCI' addition to CLOUDWARE on line 22. gjb: I have not had a chance to take a very close look, but until these can be uncommented, I… | |||||
Done Inline ActionsI think it is reasonable to add oci.conf now, even if we don't have Makefile.oci yet. (I would not commit it commented out, but just omit it entirely.) It is possible to use this infrastructure to build images for OCI even if the support for uploading them isn't available yet (it could be done via the OCI web interface in any case). emaste: I think it is reasonable to add oci.conf now, even if we don't have Makefile.oci yet. (I would… | |||||
Done Inline Actionsremoved; I do have an upload script here that works, but it is missing the additional OCI Marketplace plumbing that Ed is still working through. gjb: I'm happy to finish this, but I don't know what re@ needs wrt docs, usage - how you store the secrets for uploads etc, whether this runs in some CI or other build env?. Makefile.ec2 seems like a reasonable example to start from, once we have the Marketplace stuff working. dch: removed; I do have an upload script here that works, but it is missing the additional OCI… | |||||
.include "${.CURDIR}/Makefile.vagrant" | .include "${.CURDIR}/Makefile.vagrant" |
See comment below, but please do not enable this by default yet.