From nobody Tue Aug 29 17:43:13 2023 X-Original-To: dev-commits-src-all@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 4RZvsY6pmcz4s1v6; Tue, 29 Aug 2023 17:43:13 +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 4RZvsY3v7wz4HbT; Tue, 29 Aug 2023 17:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693330993; 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=hBJLNDsSjUtUY4B1i6GR4mSroY1vcVjQBv2qXbhE9dI=; b=GOMdnYbwQcj0a7qPSJGjGon2WbR0qnLq99YDtrwgQQEmVYQyyp/m+ldP6OsOCQNgqPtd/D sZKn6ULfPsidKk6OhNXCVlJMaYtacNAhKz5NBMLnLs1Fw8J/l55y2KMVifz9rtWozBPktY NwR04FQTxY1JoOvhLGHhBmrtholiBzqiujzdBjQFwV5FR4qz0CY2CXVy+6C6nTDoQBeNbW d6GR9U8Cnvv87/UBnDxA/PGDl5Wqe2/+cVtzHjjTBR2I7kFmadnV3bgG5wFbtwNHYDFvQ8 5pfqgnm4B6cyCns5jwsWnISfVfvZqjzyt3czL2iM3zKrHqtR+sfNyA9m8G4QSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693330993; a=rsa-sha256; cv=none; b=HBphR6beRVp6Tc5MCV7hOsIRDxwW1Si1Y6rdLp80T3ov8+fYiORCPJXCKzffBDHzhGP6sm z6yso1meeBgFcnnvwFgws+YrY0mjisqs9aLNeZfh7CbjPrhMrLfv7nZ5MgvPqSMaUiAeXs FJmk5J4vdO5eKJgSfC2GTYRpX3xi6plXS/jiSgHjrW7CB9nVV297yeZfu7MKdRmVaM2S2+ lEFiRb5BrymbL0fo5WRQnZ6O8+Xip6AQQBBMicDCELs0jyyWiedSmBpXGDYho1WMerAkWR V9wskwaAYPj1P3F70n3j9Jj/iSeaYPpoIg/uCwKsGKtAUMpnksCyFHmWoCacug== 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=1693330993; 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=hBJLNDsSjUtUY4B1i6GR4mSroY1vcVjQBv2qXbhE9dI=; b=j+m8gwD1OCbOU2FACfsTP7BkCoo1Ky/q01QBY6GSB0taFEYA1/6Akz2FB+b0tdP2iNupvN Wa5CIWFj1pCwNqdZKN03AnMI58SNwfFxVRC1sLI7bJ+65fpYMqjr1Z/LLV4LV2xLnShs/2 u0M4FE2IxwEMcp3HNvvOC9gbLteg5/4d+9a6f5iPgE1lk7DulmGozi6MLXFLqKaV7Lop5B c/EREmmE2AjM64LZ5o5jTZrg5oRFfTM5g+vK2z4ikZzUH6hblHskP2iMrN0spc0eeoppqj lq5lOPKAtsLGdDAsaWO4kQcDVtiR2bWQspNna6qy/VDMlJHt6LYxibxUTUuAAg== 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 4RZvsY2t1pz11fC; Tue, 29 Aug 2023 17:43:13 +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 37THhDdY089474; Tue, 29 Aug 2023 17:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37THhDUA089471; Tue, 29 Aug 2023 17:43:13 GMT (envelope-from git) Date: Tue, 29 Aug 2023 17:43:13 GMT Message-Id: <202308291743.37THhDUA089471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 78f901dcbd84 - main - releng-azure: Add ZFS support to Azure image buliding and uploading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78f901dcbd84ccad3849a8029f2320cf97079856 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=78f901dcbd84ccad3849a8029f2320cf97079856 commit 78f901dcbd84ccad3849a8029f2320cf97079856 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:40:39 +0000 Commit: Li-Wen Hsu CommitDate: 2023-08-29 17:40:39 +0000 releng-azure: Add ZFS support to Azure image buliding and uploading Approved by: gjb (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41454 --- release/Makefile.azure | 18 +++++++++++------- release/Makefile.vm | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 528371ad076e..a8f59282a09c 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -4,7 +4,6 @@ # Makefile for uploading Microsoft Azure disk images. # -AZURE_IMG?= ${.OBJDIR}/azure.vhdf AZURE_UPLOAD_TGTS= azure-check-depends \ azure-do-upload CLEANFILES+= ${AZURE_UPLOAD_TGTS} @@ -19,8 +18,6 @@ AZURE${VAR}!= grep -E '^AZURE${VAR}' ${AZURE_UPLOAD_CONF} | awk -F ' ' '{print $ SNAPSHOT_DATE!= date +-${BUILDDATE} .endif -AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} - START_DATE!= date -v-1d -I -u EXPIRY_DATE!= date -v+1m -I -u @@ -44,14 +41,18 @@ azure-check-depends: . endif .endif -azure-do-upload: +.for _FS in ${AZURE_FSLIST} +AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhdf +AZURE_TARGET_${_FS}= ${OSRELEASE}-${_FS}${SNAPSHOT_DATE} + +azure-do-upload-${_FS}: /usr/local/bin/az storage blob upload \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --container-name ${AZURE_STORAGE} --type page \ - --file ${AZURE_IMG} --name ${AZURE_TARGET}.vhd + --file ${AZURE_IMG_${_FS}} --name ${AZURE_TARGET_${_FS}}.vhd @echo "The disk access URL with shared access signature is:" @echo - @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET}.vhd? + @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET_${_FS}}.vhd? @/usr/local/bin/az storage container generate-sas \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --name ${AZURE_STORAGE} \ @@ -67,5 +68,8 @@ azure-do-upload: @echo @echo /usr/local/bin/az storage blob delete \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ - --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET}.vhd + --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET_${_FS}}.vhd @echo +.endfor + +azure-do-upload: azure-do-upload-${VMFS} diff --git a/release/Makefile.vm b/release/Makefile.vm index fb00804a81ec..a5d194cc2678 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -24,7 +24,7 @@ CLOUDWARE?= BASIC-CI \ VAGRANT-VIRTUALBOX \ VAGRANT-VMWARE AZURE_FORMAT= vhdf -AZURE_FSLIST= ufs +AZURE_FSLIST= ufs zfs AZURE_DESC= Microsoft Azure platform image AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} BASIC-CI_FORMAT= raw