From nobody Wed Jun 26 00:53:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W838m0PYtz5QL6g; Wed, 26 Jun 2024 00:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W838l6rfSz4ppB; Wed, 26 Jun 2024 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719363192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XM8VdKxqtBxJlShOGtL6ApstM+1VvDBaCj1cocXlS0c=; b=olD18h4OFiqiv/x6TguL2w+1ayP7FSqg4PBf0rNT6wjx4tBrwdBmFrrjEMlSgrxa0Nwtjb FNThg2Z61BgFmeVEIm0xDx4C2X2DxvoIkCeD6R4Sik5lZM+SmN3boyLThuEcg7bLlL/f0X J09gH/W7hialO091WeEDNcbqJoBwrYYy0+QyzlwDseLEI+8wf2uue5D9SaYDJa85dvtbmZ m+3uJrE+u+kjT33MSeJU5gr/hApPib0eeOXNMTwXo58tFKwxmiFLmBx2PojD0unHdTp4xG rJf47SKJ2DItPhM91YB0V06Yp4dUa+RyTADkhcNnP7fHwI61fxwtSyh0wjIP4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719363192; a=rsa-sha256; cv=none; b=jKvjPnTjpSSs8EO2RKeimoMq38oJV84XinWvjtzCcrYSNhRlRAFapMoEyUrD5f19Oi2TZD hsyubOEtaIEhhFwD2Jf9hg4p3iukilAz1dny5aHUIAoiGUsfHhua9QIk1kUbVbiTHnBYjy IUgQWO3tcdB6QRQpmMayRU2Xo0kPjTPZ4Lm3d0iXg585RSjwMUql3TL78l4r+opzc39bQh IW8eXCbpKOCRg8uZnfl9FY8hpM9yFgq6EXvlssBaSKlcx+M4vSZq9O+f9ivcwkcCw9nc94 w4soY63xFRZK3iWv7Q1IJs4ofwZmLxgSo4LdRqu4rKJ2+96FsfVZzHci8zJt2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719363192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XM8VdKxqtBxJlShOGtL6ApstM+1VvDBaCj1cocXlS0c=; b=PSmM4UA1v6kPpXSVvzHiJClgw5Zel/iIAgIVQraVCec0EUhck6IPVOaNopRNVjD9xhQZGC a7nKoLMf480wx7rRn3TmMEQgm1jDe0Uw3MALTF+VHvFYmYBDvUlxbRRPDzNNSBm1gU5P27 L7Up/uxLquJX4Ve1ZMhwy+M4IFxF9kX5Mx1zzA94fzb8BcMooW252Q+8GtIRA5wHDbKjWE c+ASz8WqdG2WxW+H9eOfPQT90g/YaXrjdYpThH2uGyJFpYorxzUq6C9UOVXeGcMyU5ZlSJ x2tvB3AH4ppZIPoUF/LE+lIdbjan224mXhzMkmCcosNjdug7vPxW0/NKpB+zLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W838l5kpTzPJT; Wed, 26 Jun 2024 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q0rBu2064018; Wed, 26 Jun 2024 00:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q0rB3u064015; Wed, 26 Jun 2024 00:53:11 GMT (envelope-from git) Date: Wed, 26 Jun 2024 00:53:11 GMT Message-Id: <202406260053.45Q0rB3u064015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d6fecbebfcea - stable/13 - release: Publish non-uploaded cloudware bits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d commit d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d Author: Colin Percival AuthorDate: 2024-06-19 19:28:42 +0000 Commit: Colin Percival CommitDate: 2024-06-26 00:52:55 +0000 release: Publish non-uploaded cloudware bits [MFC note: We don't have BASIC-CLOUDINIT or support for multiple disk formats or filesystems in VMs on 13.x so this MFC only does BASIC-CI and only for UFS on RAW.] While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week (cherry picked from commit 4771c2e9d1c7db949a82dfe4f2b9878bb358a50e) --- release/Makefile | 3 ++- release/Makefile.mirrors | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ release/Makefile.vm | 20 +++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 7e6bc566961c..55d82a0d0f5e 100644 --- a/release/Makefile +++ b/release/Makefile @@ -14,6 +14,7 @@ # install: Invokes the release-install and vm-install targets # release-install: Copies all release installation media into ${DESTDIR} # vm-install: Copies all virtual machine images into ${DESTDIR} +# cloud-install: Copies non-uploaded cloud images into ${DESTDIR} # # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel @@ -267,7 +268,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install +install: release-install vm-install .WAIT cloud-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index cbc5cd768e28..904040eb11ba 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -53,6 +53,11 @@ STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +STAGE_TARGETS+= ci-images-stage +CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -219,5 +224,52 @@ vm-images-stage: . endfor .endif +ci-images-stage: + mkdir -p ${CI_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest + mkdir -p ${CI_DIR}/${BUILDDATE} +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}.raw.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz \ + ${OSRELEASE}-${CW}.raw.xz +. endif +. endfor + cd ${RELEASEDIR}/ciimages && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ciimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.raw.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.raw.xz +. endif +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM} \ + ${CI_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 2e5bdb9a7004..520f47ab3ca6 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -174,6 +174,26 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif +cloud-install-BASIC-CI: + mkdir -p ${DESTDIR}/ciimages + cp -p ${.OBJDIR}/${BASIC-CIIMAGE} \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.raw + ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.raw + cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA512 + cd ${DESTDIR}/ciimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA256 + +CLOUD_INSTALL_TGTS= +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for _CW in ${CLOUDWARE} +. if target(cloud-install-${_CW}) +CLOUD_INSTALL_TGTS+= cloud-install-${_CW} +. endif +. endfor +.endif +cloud-install: ${CLOUD_INSTALL_TGTS} + vm-release: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}