From owner-svn-src-head@freebsd.org Thu May 30 16:49:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A71115A43EF; Thu, 30 May 2019 16:49:42 +0000 (UTC) (envelope-from gjb@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9D89F93D4F; Thu, 30 May 2019 16:49:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79FD51BD02; Thu, 30 May 2019 16:49:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4UGnfon073241; Thu, 30 May 2019 16:49:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4UGnfhG073239; Thu, 30 May 2019 16:49:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201905301649.x4UGnfhG073239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 30 May 2019 16:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348438 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 348438 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9D89F93D4F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 May 2019 16:49:42 -0000 Author: gjb Date: Thu May 30 16:49:40 2019 New Revision: 348438 URL: https://svnweb.freebsd.org/changeset/base/348438 Log: Fix GCE virtual machine startup. The ports/head branch recently switched to python3 as the default, which breaks the sysutils/py-google-compute-engine startup scripts, as lang/python installs lang/python3{,.x} where lang/python2{,.x} are needed. Set DEFAULT_VERSIONS in release/tools/gce.conf to python=2.7, and remove the lang/python3 inclusion in VM_EXTRA_PACKAGES. Additionally, unset DEFAULT_VERSIONS in release/tools/vmimage.subr to prevent persistence of DEFAULT_VERSIONS=python=2.7 in subsequent VM/cloud image builds. Note: at present, this affects only 13-CURRENT and 12-STABLE, as the stable/11 branch had already switched to using the 2019Q2 branch at the start of the 11.3-RELEASE cycle, so this does not immediately affect 11.3-BETA, hence the 1-week merge timeout. This had been manually tested on 13-CURRENT. Reported by: ler (privately) MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/release/tools/gce.conf head/release/tools/vmimage.subr Modified: head/release/tools/gce.conf ============================================================================== --- head/release/tools/gce.conf Thu May 30 16:42:57 2019 (r348437) +++ head/release/tools/gce.conf Thu May 30 16:49:40 2019 (r348438) @@ -6,10 +6,14 @@ # The default of 3GB is too small for GCE, so override the size here. export VMSIZE=20G +# The sysutils/py-google-compute-engine port needs the lang/python +# symbolic link to point to lang/python2. +export DEFAULT_VERSIONS="python=2.7" + # Set to a list of packages to install. export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ - lang/python lang/python2 lang/python3" + lang/python lang/python2" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Thu May 30 16:42:57 2019 (r348437) +++ head/release/tools/vmimage.subr Thu May 30 16:49:40 2019 (r348438) @@ -72,6 +72,10 @@ cleanup() { mdconfig -d -u ${mddev} fi + # Avoid inheriting the DEFAULT_VERSIONS for lang/python from + # the gce.conf. + unset DEFAULT_VERSIONS + return 0 }