Merge ~goneri/cloud-init:freebsd_python3 into cloud-init:master

[Gonéri Le Bouder]

tools/build-on-freebsd: update to python3

- use python3 by default
- ability to use any Python version through the PYTHON env-var
- indent with 4 spaces
- use 'set -eux'
- remove trailing whitespace
- drop the cheetah dep, Jinja2 is enough

[Ryan Harper (raharper)]

This patch drops py27 support.

should you allow callers to specify the version ?

For example in tools/bddeb there is --python2
which enables a build for py26/py27

Since you're already extracting the python major, minor
the rest of the code is flexible.

Thoughts?

review: Needs Information

[Gonéri Le Bouder (goneri)]

A polite "no" :-) Every supported FreeBSD releases come with Python3. I don't see a good reason for making our life (a little bit more) complicated.

[Ryan Harper (raharper)]

OK, does build-on-freebsd not work at all on py27?

[Gonéri Le Bouder (goneri)]

Python3 was released 11 years ago and is available in all the major OS and distribution, Python2 is OLD and will be EOL next year, and it's still a major source of problem. If you think Python2 is important, why https://bugs.launchpad.net/cloud-init/+bug/1801364 is still open? I do these FreeBSD patches on my spare time and I don't want to waste it with this kind of futile request.

[Ryan Harper (raharper)]

I meant no offense and I know this is your free time. We don't test directly on freebsd, so I'm asking for more information from those who do.

While python2 is every OLD and will EOL, it will still be around. I would prefer to default to python3 but not make it impossible for folks using/building python2 to do so, if that makes sense.

[Gonéri Le Bouder (goneri)]

Hi Ryan,

Sorry for the strong tone of my previous answer. I will adjust the script to allow the user to specify the Python version to use.

[Gonéri Le Bouder (goneri)]

Done, I pushed my updated version.

[Ryan Harper (raharper)]

Thanks!

That looks good. One inline comment request for a comment.

[Ryan Harper (raharper)]

Yes

On Mon, Jun 17, 2019 at 10:22 AM Gonéri Le Bouder <email address hidden>
wrote:

>
>
> Diff comments:
>
> > diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
> > index dc3b974..b73cec8 100755
> > --- a/tools/build-on-freebsd
> > +++ b/tools/build-on-freebsd
> > @@ -3,36 +3,44 @@
> > # installing cloud-init. This script takes care of building and
> installing. It
> > # will optionally make a first run at the end.
> >
> > +set -eux
> > +
> > fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
> >
> > +PYTHON="${PYTHON:-python3}"
> > +if [ ! $(which ${PYTHON}) ]; then
> > + echo "Please install python first."
> > + exit 1
> > +fi
> > +py_prefix=$(${PYTHON} -c 'import sys; print("py%d%d" %
> (sys.version_info.major, sys.version_info.minor))')
> > +
> > # Check dependencies:
> > depschecked=/tmp/c-i.dependencieschecked
> > pkgs="
> > - bash
> > - chpasswd
> > - dmidecode
> > - e2fsprogs
> > - py27-Jinja2
> > - py27-boto
> > - py27-cheetah
> > - py27-configobj
> > - py27-jsonpatch
> > - py27-jsonpointer
> > - py27-jsonschema
> > - py27-oauthlib
> > - py27-requests
> > - py27-serial
> > - py27-six
> > - py27-yaml
> > - python
> > - sudo
> > + bash
> > + chpasswd
> > + dmidecode
> > + e2fsprogs
> > + $py_prefix-Jinja2
> > + $py_prefix-boto
> > + $py_prefix-configobj
> > + $py_prefix-jsonpatch
> > + $py_prefix-jsonpointer
> > + $py_prefix-jsonschema
> > + $py_prefix-oauthlib
> > + $py_prefix-requests
> > + $py_prefix-serial
> > + $py_prefix-six
> > + $py_prefix-yaml
> > + sudo
> > "
> > -[ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
> > +[ -f "$depschecked" ] || pkg install --yes ${pkgs} || fail "install
> packages"
> > touch $depschecked
> >
> > +pkg install $py_prefix-cheetah || true
>
> well, in this case, it's probably better to just disable, isn't it?
>
> > # Build the code and install in /usr/local/:
> > -python2.7 setup.py build
> > -python2.7 setup.py install -O1 --skip-build --prefix /usr/local/
> --init-system sysvinit_freebsd
> > +${PYTHON} setup.py build
> > +${PYTHON} setup.py install -O1 --skip-build --prefix /usr/local/
> --init-system sysvinit_freebsd
> >
> > # Enable cloud-init in /etc/rc.conf:
> > sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
>
>
> --
> https://code.launchpad.net/~goneri/cloud-init/+git/cloud-init/+merge/368791
> You are reviewing the proposed merge of ~goneri/cloud-init:freebsd_python3
> into cloud-init:master.
>

[Gonéri Le Bouder (goneri)]

done

[Ryan Harper (raharper)]

Thanks!

review: Approve

[Ryan Harper (raharper)]

Once more, now with more commit message.

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index dc3b974..8ae6456 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -3,36 +3,43 @@
 # installing cloud-init. This script takes care of building and installing. It
 # will optionally make a first run at the end.
 
+set -eux
+
 fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
 
+PYTHON="${PYTHON:-python3}"
+if [ ! $(which ${PYTHON}) ]; then
+    echo "Please install python first."
+    exit 1
+fi
+py_prefix=$(${PYTHON} -c 'import sys; print("py%d%d" % (sys.version_info.major, sys.version_info.minor))')
+
 # Check dependencies:
 depschecked=/tmp/c-i.dependencieschecked
 pkgs="
-   bash
-   chpasswd
-   dmidecode
-   e2fsprogs
-   py27-Jinja2
-   py27-boto
-   py27-cheetah
-   py27-configobj
-   py27-jsonpatch
-   py27-jsonpointer
-   py27-jsonschema
-   py27-oauthlib
-   py27-requests
-   py27-serial
-   py27-six
-   py27-yaml
-   python
-   sudo
+    bash
+    chpasswd
+    dmidecode
+    e2fsprogs
+    $py_prefix-Jinja2
+    $py_prefix-boto
+    $py_prefix-configobj
+    $py_prefix-jsonpatch
+    $py_prefix-jsonpointer
+    $py_prefix-jsonschema
+    $py_prefix-oauthlib
+    $py_prefix-requests
+    $py_prefix-serial
+    $py_prefix-six
+    $py_prefix-yaml
+    sudo
 "
-[ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
+[ -f "$depschecked" ] || pkg install --yes ${pkgs} || fail "install packages"
 touch $depschecked
 
 # Build the code and install in /usr/local/:
-python2.7 setup.py build
-python2.7 setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
+${PYTHON} setup.py build
+${PYTHON} setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
 
 # Enable cloud-init in /etc/rc.conf:
 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
@@ -40,21 +47,21 @@ echo 'cloudinit_enable="YES"' >> /etc/rc.conf
 
 echo "Installation completed."
 
-if [ "$1" = "run" ]; then
-	echo "Ok, now let's see if it works."
+if [ "$#" -gt 1 ] && [ "$1" = "run" ]; then
+    echo "Ok, now let's see if it works."
 
-	# Backup SSH keys
-	mv /etc/ssh/ssh_host_* /tmp/
+    # Backup SSH keys
+    mv /etc/ssh/ssh_host_* /tmp/
 
-	# Remove old metadata
-	rm -rf /var/lib/cloud
+    # Remove old metadata
+    rm -rf /var/lib/cloud
 
-	# Just log everything, quick&dirty
-	rm /usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg 
+    # Just log everything, quick&dirty
+    rm /usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg
 
-	# Start:
-	/usr/local/etc/rc.d/cloudinit start
+    # Start:
+    /usr/local/etc/rc.d/cloudinit start
 
-	# Restore SSH keys
-	mv /tmp/ssh_host_* /etc/ssh/
+    # Restore SSH keys
+    mv /tmp/ssh_host_* /etc/ssh/
 fi