git: 45846afcb7ae - main - release: Stop publishing non-FS-tagged VM images

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=45846afcb7ae1b9682107a62b105aeb5021994ba

commit 45846afcb7ae1b9682107a62b105aeb5021994ba
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-06-21 21:39:44 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-06-21 21:42:10 +0000

    release: Stop publishing non-FS-tagged VM images
    
    VM, BASIC-CI, and BASIC-CLOUDWARE images are published with the
    filesystem type (UFS or ZFS) in the file name.  For backwards
    compatibility we have published the UFS images with no filesystem
    in the filename (aka with the same file names as we used before we
    supported building ZFS VM images); those are going away now.
    
    This will not be MFCed.
---
 release/Makefile.mirrors | 20 --------------------
 release/Makefile.vm      | 12 ------------
 2 files changed, 32 deletions(-)

diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 1888f86d3002..8a6888ccc96c 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -190,14 +190,6 @@ vm-images-stage:
 	mkdir -p ${VM_DIR}/Latest
 	mkdir -p ${VM_DIR}/${BUILDDATE}
 . for VMFORMAT in ${VMFORMATS}
-	cd ${RELEASEDIR}/vmimages && \
-		mv ${OSRELEASE}.${VMFORMAT}.xz \
-		${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz
-	cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
-		${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz
-	cd ${VM_DIR}/Latest && \
-		ln -s ../${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
-		${OSRELEASE}.${VMFORMAT}.xz
 .  for FS in ${VMFSLIST}
 	cd ${RELEASEDIR}/vmimages && \
 		mv ${OSRELEASE}-${FS}.${VMFORMAT}.xz \
@@ -243,8 +235,6 @@ vm-images-stage:
 . endif
 	mkdir -p ${VM_DIR}/Latest
 . for VMFORMAT in ${VMFORMATS}
-	cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}.${VMFORMAT}.xz \
-		${VM_DIR}/Latest/${OSRELEASE}.${VMFORMAT}.xz
 .  for FS in ${VMFSLIST}
 	cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}.${VMFORMAT}.xz \
 		${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz
@@ -289,14 +279,6 @@ ci-images-stage:
 		ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
 		${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
 .    endfor
-	cd ${RELEASEDIR}/ciimages && \
-		mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \
-		${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz
-	cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
-		${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz
-	cd ${CI_DIR}/Latest && \
-		ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
-		${OSRELEASE}-${CW}.${VMFORMAT}.xz
 .   endfor
 .  endif
 . endfor
@@ -322,8 +304,6 @@ ci-images-stage:
 	cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \
 		${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
 .    endfor
-	cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \
-		${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz
 .   endfor
 .  endif
 . endfor
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 8c48c0a13dc9..f5dc6af67189 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -209,14 +209,6 @@ vm-install:
 .   endfor
 .  endfor
 . endif
-	# Compatibility hardlinks from "foo.bar" to "foo-${VMFS}.bar".
-. for FORMAT in ${VMFORMATS}
-.  if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
-	ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT}.xz ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}.xz
-.  else
-	ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
-.  endif
-. endfor
 	cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
@@ -231,10 +223,6 @@ cloud-install-BASIC-CI:
 		${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
 	${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
 . endfor
-.endfor
-.for _FMT in ${BASIC-CI_FORMAT}
-	ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \
-		${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz
 .endfor
 	cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/ciimages/CHECKSUM.SHA512