From nobody Wed Nov 13 13:28:43 2024 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 4XpPHv3wg2z5dck4; Wed, 13 Nov 2024 13:28:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XpPHv2zZnz4jSR; Wed, 13 Nov 2024 13:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731504523; 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=WibXmFTZiduvN0TZgcZNocJ8kYSrCTUbW7vSdSxSuL0=; b=KdarGJQ9MlYoQAZOL8/zCpjEY7d9DOT+q/HZ3nFqH4sjdW8C5Vk8A0o2HvBuEggCdBbeuB F64je7wiELZ82eYS2K8dZcdHfyMjXRvCsuHL05X2iU35ucuTVLy8dItObT7bY3s51zyu36 wFvFhJoZInMObq7ZYKP8Ku0t+gX0+Sltg/bHpe9qOdtmwmG7lfH4dnfvFEB4i7xX+HLHSg 7qQRehNU7+JJtWYC2R2UeWUV9uVLAC51mGXh9vOy+DPLY10u6wzJBQQnXlDFuSwQnqDpIm UI1+MGqH9So3lgGc+8s95US58orgqPQ33ZhKhYX081S+11g1dJgQ3dxK9apiUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731504523; 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=WibXmFTZiduvN0TZgcZNocJ8kYSrCTUbW7vSdSxSuL0=; b=X9tlrwAr7wZDIM5js3hf5eVJFlWxPPWssWKguskRphQz0NeE/PG9/vROI3GuMfndCiw9Gc Um16whgxOZyZK4jDfzoVFVO+0cofIXklBZJww9LL3M9Z+kyoZjABtrhkNJT1uGU9ZBCq26 hmSEaLKl98EwLTcpvsLc8rBQvS4NOCJp8W7aP2XhiU1arkaba/3L/mBcxFmEdqMkkC/b8x 1VrgmQjnv4DyHc9p7PeWn4KgtD/GTYeiAEKB9quAxLUlLP0G7rvM1bKHOGfRbYN6lyCltm 0D55XJchH3sDGdWYm0cH1/wrCuDWhxU+XzPtz3lSuyuAI/nkA98XCYgXpxL1wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731504523; a=rsa-sha256; cv=none; b=GDqXP2+t28iAdCcpU+bVUjQ7fQCr/lmljXpKe2zogd560tL+hDykE2yHZhqmOYMRhbUsgS N1mvKlBZinmXj0ivou+E3AWPdCy9s+1k4SqoW62OFcztd9P0aHw5Mv/40PHllW68lO6goD Cnki8CBnWcTb0e74k+Oh8P7J2G3oFnuA07uxmscaAWZ5/LnABj7NWhlCuwXTrfp0qQRWPS ZxwXTPXXEFLKRlXwB91NeDJXfl8cSlFy2vrzwEVDHNy6hOWITJaZNDIlR7KhRYSBCrUVZe /iABfPYqp/Do+MrdZz1cTpHdwD/6u0yDmXCRhyyVCGGKXokdO7Tu48Di2UQ/sw== 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 4XpPHv2F5BzwWv; Wed, 13 Nov 2024 13:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ADDShHF063488; Wed, 13 Nov 2024 13:28:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ADDShh6063485; Wed, 13 Nov 2024 13:28:43 GMT (envelope-from git) Date: Wed, 13 Nov 2024 13:28:43 GMT Message-Id: <202411131328.4ADDShh6063485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: aad6a5f96b78 - stable/13 - release: move OCI to ORACLE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aad6a5f96b7820e2d67b1d01435100353c7f15ac Auto-Submitted: auto-generated The branch stable/13 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=aad6a5f96b7820e2d67b1d01435100353c7f15ac commit aad6a5f96b7820e2d67b1d01435100353c7f15ac Author: Dave Cottlehuber AuthorDate: 2024-10-15 09:28:12 +0000 Commit: Dave Cottlehuber CommitDate: 2024-11-13 13:08:15 +0000 release: move OCI to ORACLE This allows future releng tooling to use OCI for the industry standard Open Container Initiative tooling, reducing potential for confusion. Approved by: cperciva Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D46975 MFC after: 3 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit 1be84d745bcc11b766ac1fa03afd2c8ea8771737) --- release/Makefile.vm | 8 ++++---- release/release.conf.sample | 2 +- release/tools/{oci.conf => oracle.conf} | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 4d301672836d..d3fe1e161260 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -22,7 +22,7 @@ RAW_DESC= Unformatted raw disk image CLOUDWARE?= BASIC-CI \ EC2 \ GCE \ - OCI \ + ORACLE \ VAGRANT-VIRTUALBOX \ VAGRANT-VMWARE AZURE_FORMAT= vhdf @@ -37,9 +37,9 @@ EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} GCE_FORMAT= raw GCE_DESC= Google Compute Engine image GCE_DISK= disk.${GCE_FORMAT} -OCI_FORMAT= qcow2 -OCI_DESC= Oracle Cloud Infrastructure image -OCI_DISK= ${OSRELEASE}.${OCI_FORMAT} +ORACLE_FORMAT= qcow2 +ORACLE_DESC= Oracle Cloud Infrastructure image +ORACLE_DISK= ${OSRELEASE}.${OCI_FORMAT} OPENSTACK_FORMAT=qcow2 OPENSTACK_DESC= OpenStack platform image OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT} diff --git a/release/release.conf.sample b/release/release.conf.sample index e4e37909c34e..998392036f4d 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -113,4 +113,4 @@ PORTBRANCH="main" ## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers ## to create disk images. -#CLOUDWARE="EC2 GCE OCI VAGRANT-VIRTUALBOX VAGRANT-VMWARE" +#CLOUDWARE="EC2 GCE ORACLE VAGRANT-VIRTUALBOX VAGRANT-VMWARE" diff --git a/release/tools/oci.conf b/release/tools/oracle.conf similarity index 94% rename from release/tools/oci.conf rename to release/tools/oracle.conf index 47231d65d79b..b0d5afc3cef8 100644 --- a/release/tools/oci.conf +++ b/release/tools/oracle.conf @@ -68,15 +68,15 @@ EOF # S14 Root user login must be disabled on serial-over-ssh console pw -R ${DESTDIR} usermod root -w no - # OCI requirements override the default FreeBSD cloud-init settings - cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg + # Oracle requirements override the default FreeBSD cloud-init settings + cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg disable_root: true system_info: distro: freebsd default_user: name: freebsd lock_passwd: True - gecos: "OCI Default User" + gecos: "Oracle Cloud Default User" groups: [wheel] sudo: ["ALL=(ALL) NOPASSWD:ALL"] shell: /bin/sh