From nobody Wed Oct 18 19:17:54 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 4S9gbk68djz4xQ82; Wed, 18 Oct 2023 19:17:54 +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 4S9gbk5Yx0z4nvy; Wed, 18 Oct 2023 19:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656674; 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=a9gBP4qoeMFHNimjwyeB29eV6aqV3bzfugUQuMKfpYc=; b=W/16vAnW/smBgnZl7ODLzS1s8GoV/a+nrjpMle5DOh7oJtYsY/gEo7Bc0PVAOHFTe8i02g 85p9yYfqiCNPo10xysz2treOQdPgyon4tpy8HQLkICEywtGb2kj3gsJlbRYmWBSN1Efzkg sm6KBfid6umolBGb6QM4JDkj0lOJs6ssHiTD2WWkNB/bj4p59x2M7KPf19Uu/rT0nXO17p 6P5dhtURK+dtByZhdj8drekrg9Tab2N1fSAY8ni672e8ARYtcDFZAsWEBwptaz3pGd0n+v vMHs5pcVDirco0bvS0pz/UZRNUGwMd6vgSs77Y8II+jGJ7GCkep5QZ/1m5Lapg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697656674; a=rsa-sha256; cv=none; b=cb/GJImBe8WyxojJNpE+5WLoRjCVRdZL2Wt4X7jpAP5wYIhSaNexCrrGiE6FOmzcuW3UWo p4REVeY6f8l9Aa1ipj0GyLK9zEI4KMfupuouYNl92C/3SnqI3GImXNqFe15aKUkBIqCNuv JwQiEBdH6ixNVHDWzVhDbXk91V14cF4EN221GZ3q1Y6+wllGuS1JeCmVPvHpwRzvfz67Br c8AyxwxIcrK+uhDVP4EAfpCLXA4Eb9UhrzsyKpq6IKwAX0dCYq3lnaEoVXQGNeH9E5dlKS EY3GJXY/HJlmRjnZKN9/b4I3ihopFcsJv1Gzn49TUETIEeVJxyDpzHuJDZRL5Q== 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=1697656674; 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=a9gBP4qoeMFHNimjwyeB29eV6aqV3bzfugUQuMKfpYc=; b=yEhzcIp9wV1xhHGcQI9mq/bD1/2pF+/87gSjqrB/feTCj8t798S9hLFKMOd0g8k3UHIB5b gCNWqI7Ewxqyd/g2xER16Wsg5Ghlgft4I2aLkziDmHZ3LBtRmzkLJMPWcLsoz4KEZPlpk7 GSNvHdamog+yCDFCVVTmGHVgNe4daf7ajLlznrwa34KcYs7SNPyvFSS+EaDmZ1I7xLLrCr KfhKPOk+1Zi+vGghIlAVQEAN92ByY7ouYM0htP4P/pQJPviq+9pWQeqpZ+e7Dw/8hEdovL StlFrpSScg8m+fvNBQD0AUfX8zTmSVyJTa+ae9BxQ2f7jpVw2q2Lrr4uN1nAaw== 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 4S9gbk42jSz45P; Wed, 18 Oct 2023 19:17:54 +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 39IJHsYq062910; Wed, 18 Oct 2023 19:17:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJHsQu062907; Wed, 18 Oct 2023 19:17:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:17:54 GMT Message-Id: <202310181917.39IJHsQu062907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 96e76036949f - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 96e76036949fffb7f02a423cca6589873966b503 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=96e76036949fffb7f02a423cca6589873966b503 commit 96e76036949fffb7f02a423cca6589873966b503 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:40:39 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-18 19:17:25 +0000 releng-azure: Add ZFS support to Azure image buliding and uploading Approved by: gjb (re), delphij (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41454 (cherry picked from commit 78f901dcbd84ccad3849a8029f2320cf97079856) (cherry picked from commit 1e7218e33974089234841420bb69777a29a91c61) --- 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 09e31e3c0b6f..e1bba5271a4c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -23,7 +23,7 @@ CLOUDWARE_TYPES?= BASIC-CI \ OCI \ VAGRANT AZURE_FORMAT= vhdf -AZURE_FSLIST= ufs +AZURE_FSLIST= ufs zfs AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST= ufs