From ea667b44e39b40f3c546b0330108232b71dd3e5c Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 21 Jan 2022 19:57:49 -0500 Subject: [PATCH 1/9] vagrant: add box: 'rockylinux/8' to vagrant_variables.example --- vagrant_variables.yml.example | 1 + 1 file changed, 1 insertion(+) diff --git a/vagrant_variables.yml.example b/vagrant_variables.yml.example index 1dec4a1b..986334df 100644 --- a/vagrant_variables.yml.example +++ b/vagrant_variables.yml.example @@ -74,3 +74,4 @@ domain: ouranos.ca # disksize: '100GB' # box: 'ubuntu/bionic64' # no manual steps required # box: 'centos/7' # will require manual 'vagrant-utils/disk-resize' inside box +# box: 'rockylinux/8' From 4f95409030b81cbaf2d7fe9e24c202224f188caf Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 21 Jan 2022 20:01:24 -0500 Subject: [PATCH 2/9] vagrant: fix provision scripts to support rockylinux --- birdhouse/vagrant-utils/configure-pagekite | 4 ++-- birdhouse/vagrant-utils/install-docker.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/birdhouse/vagrant-utils/configure-pagekite b/birdhouse/vagrant-utils/configure-pagekite index f6b1d254..96e827c7 100755 --- a/birdhouse/vagrant-utils/configure-pagekite +++ b/birdhouse/vagrant-utils/configure-pagekite @@ -4,7 +4,7 @@ ACCOUNT_CONF="/etc/pagekite.d/10_account.rc" if [ -n "$KITENAME" -a -n "$KITESECRET" -a -n "$KITESUBDOMAIN" ]; then - if ! grep centos /etc/os-release; then + if ! grep centos /etc/os-release && ! grep rocky /etc/os-release; then DEBIAN_FRONTEND=noninteractive apt-get install --yes pagekite else yum install --assumeyes epel-release @@ -26,7 +26,7 @@ EOF else DISABLE_PAGEKITE="" - if ! grep centos /etc/os-release; then + if ! grep centos /etc/os-release && ! grep rocky /etc/os-release; then if dpkg -l pagekite; then DISABLE_PAGEKITE=true fi diff --git a/birdhouse/vagrant-utils/install-docker.sh b/birdhouse/vagrant-utils/install-docker.sh index 7599c16b..9be8993d 100755 --- a/birdhouse/vagrant-utils/install-docker.sh +++ b/birdhouse/vagrant-utils/install-docker.sh @@ -3,7 +3,7 @@ set -e # Exit if any subcommand fails set -x # Print commands for troubleshooting -if ! grep centos /etc/os-release; then +if ! grep centos /etc/os-release && ! grep rocky /etc/os-release; then # Install Docker CE on Ubuntu per # https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/ From f6344a1de97d744fc6c91835366914a32129d6e8 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 21 Jan 2022 20:16:06 -0500 Subject: [PATCH 3/9] vagrant: install-docker.sh: latest docker-compose tags now starts with 'v' 7c47673d4af41d79900e6c70bc1a3f9f17bdd387 refs/tags/v2.0.0 1a73d1412d562e32effbe7b322f17e8d77ad7755 refs/tags/v2.0.0-rc.3 a23c64688b2e324158900500d744f957b8aecc17 refs/tags/v2.0.1 0a81a98b7dc6b2604922f9d6992c250f03304c5d refs/tags/v2.0.1^{} 98b3353cbcc2cf01bbd5a4ca13928ccf6dc9a283 refs/tags/v2.1.0 e6599c7213f70b0a47b410450394c07e0b0245c9 refs/tags/v2.1.1 e1a38f984b7d00f7301e865c35423c7a80197e0e refs/tags/v2.2.0 32005b0bfee3c731073a88c34576d2d572a27b4e refs/tags/v2.2.1 e2f33af831ae9edcfa8efd53dfe24a36337a8250 refs/tags/v2.2.2 6dc6bedb60d486691a4b53e0b88273b978523786 refs/tags/v2.2.3 --- birdhouse/vagrant-utils/install-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/vagrant-utils/install-docker.sh b/birdhouse/vagrant-utils/install-docker.sh index 9be8993d..da3dab48 100755 --- a/birdhouse/vagrant-utils/install-docker.sh +++ b/birdhouse/vagrant-utils/install-docker.sh @@ -93,7 +93,7 @@ fi echo 'export PATH="$PATH:/usr/local/bin"' | sudo tee /etc/profile.d/usr_local_path.sh # install docker-compose, from https://gist.github.com/wdullaer/f1af16bd7e970389bad3 -LATEST_COMPOSE_VERSION="`git ls-remote https://github.com/docker/compose | grep refs/tags | grep -v refs/tags/v | grep -oP "[0-9]+\.[0-9][0-9]+\.[0-9]+$"|tail -1`" +LATEST_COMPOSE_VERSION="`git ls-remote https://github.com/docker/compose | grep refs/tags | grep -oP "v[0-9]+\.[0-9]\.[0-9]+$"|tail -1`" # LATEST_COMPOSE_VERSION=$(curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r) # need jq :( sudo curl -L "https://github.com/docker/compose/releases/download/$LATEST_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose From e54e1a8935965e5b8d2590ea18320e2d5fb7ae49 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 21 Jan 2022 20:45:49 -0500 Subject: [PATCH 4/9] vagrant: rockylinux/8 box also requires manual disk-resize like centos/7 box --- vagrant_variables.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant_variables.yml.example b/vagrant_variables.yml.example index 986334df..1b312b2a 100644 --- a/vagrant_variables.yml.example +++ b/vagrant_variables.yml.example @@ -74,4 +74,4 @@ domain: ouranos.ca # disksize: '100GB' # box: 'ubuntu/bionic64' # no manual steps required # box: 'centos/7' # will require manual 'vagrant-utils/disk-resize' inside box -# box: 'rockylinux/8' +# box: 'rockylinux/8' # will require manual 'vagrant-utils/disk-resize' inside box From 7c5349f5c672242f8f004958b2dbf66193545d15 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 21 Jan 2022 23:51:54 -0500 Subject: [PATCH 5/9] vagrant: add reminder how to manual re-install vbguest --- Vagrantfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index a1900680..d50fc5fc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,13 @@ Vagrant.configure("2") do |config| # bug https://github.com/hashicorp/vagrant/issues/3341 still happening as of # 2019-07-03 with VirtualBox 6.0.8 - config.vbguest.auto_update = false + if Vagrant.has_plugin?("vagrant-vbguest") then + # vagrant plugin list + # vagrant vbguest --status + # vagrant vbguest --do install # manual re-install if OS update wiped it + # Sometime manual re-install do not work, best to take a VM snapshot before OS update for rollback. + config.vbguest.auto_update = false + end # https://blog.centos.org/2018/01/updated-centos-vagrant-images-available-v1801-01/ # Fix /vagrant shared folders (together with vagrant-vbguest) for Centos 7. From c12961a8c6bec6827e0550628be6c7c7ef1cb416 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Sat, 22 Jan 2022 00:26:50 -0500 Subject: [PATCH 6/9] CHANGES: add support RockyLinux --- CHANGES.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 8c6cb1c3..ad0b31cd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,18 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes: +- vagrant: support RockyLinux + + RockyLinux 8 is the successor to Centos 7. + + Centos 8 has become like a "RHEL 8 beta" than the equivalent of RHEL 8. + + RockyLinux 8 is the new equivalent of RHEL 8, following the original spirit + of the Centos project. + + More info at https://rockylinux.org/about. + [1.18.3](https://github.com/bird-house/birdhouse-deploy/tree/1.18.3) (2021-12-17) ------------------------------------------------------------------------------------------------------------------ From d5812b4551f44b0b38888ca5c69486e611582029 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Tue, 25 Jan 2022 11:09:13 -0500 Subject: [PATCH 7/9] =?UTF-8?q?Bump=20version:=201.18.3=20=E2=86=92=201.18?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGES.md | 5 +++++ README.rst | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 497c7aad..e0d578a5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.18.3 +current_version = 1.18.4 commit = True tag = False tag_name = {new_version} diff --git a/CHANGES.md b/CHANGES.md index ad0b31cd..2775ab87 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[1.18.4](https://github.com/bird-house/birdhouse-deploy/tree/1.18.4) (2022-01-25) +------------------------------------------------------------------------------------------------------------------ + ## Changes: - vagrant: support RockyLinux diff --git a/README.rst b/README.rst index 70a1c17f..d61747ec 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.18.3.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.18.4.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.18.3...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.18.4...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.18.3-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.18.4-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.18.3 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.18.4 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) From cecd097fd0bfdfedc344b33f2d09dc9e78aa91e6 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 27 Jan 2022 08:55:02 -0500 Subject: [PATCH 8/9] jupyter: update Jupyter env for latest XClim, RavenPy and all packages Deploy new Jupyter env from PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/95 on PAVICS. Detailed changes can be found at https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/95. Relevant changes: ```diff < - xclim=0.31.0=pyhd8ed1ab_0 > - xclim=0.32.1=pyhd8ed1ab_0 < - ravenpy=0.7.5=pyhff6ddc9_0 > - ravenpy=0.7.8=pyh8a188c0_0 < - python=3.7.12=hb7a2778_100_cpython > - python=3.8.12=hb7a2778_2_cpython < - vcs=8.2.1=pyh9f0ad1d_0 < - numpy=1.21.4=py37h31617e3_0 > - numpy=1.21.5=py38h87f13fb_0 < - xarray=0.20.1=pyhd8ed1ab_0 > - xarray=0.20.2=pyhd8ed1ab_0 < - rioxarray=0.8.0=pyhd8ed1ab_0 > - rioxarray=0.9.1=pyhd8ed1ab_0 < - cf_xarray=0.6.1=pyh6c4a22f_0 > - cf_xarray=0.6.3=pyhd8ed1ab_0 < - gdal=3.3.2=py37hd5a0ba4_2 > - gdal=3.3.3=py38hcf2042a_0 < - rasterio=1.2.6=py37hc20819c_2 > - rasterio=1.2.10=py38hfd64e68_0 < - climpred=2.1.6=pyhd8ed1ab_1 > - climpred=2.2.0=pyhd8ed1ab_0 < - clisops=0.7.0=pyh6c4a22f_0 > - clisops=0.8.0=pyh6c4a22f_0 < - xesmf=0.6.0=pyhd8ed1ab_0 > - xesmf=0.6.2=pyhd8ed1ab_0 < - birdy=v0.8.0=pyh6c4a22f_1 > - birdy=0.8.1=pyh6c4a22f_1 < - cartopy=0.20.0=py37hbe109c4_0 > - cartopy=0.20.1=py38hf9a4893_1 < - dask=2021.11.2=pyhd8ed1ab_0 > - dask=2022.1.0=pyhd8ed1ab_0 < - numba=0.53.1=py37hb11d6e1_1 > - numba=0.55.0=py38h4bf6c61_0 < - pandas=1.3.4=py37he8f5f7f_1 > - pandas=1.3.5=py38h43a58ef_0 ``` --- CHANGES.md | 65 ++++++++++++++++++++++++++++++++++++++++++- birdhouse/default.env | 2 +- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2775ab87..da06b929 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,70 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes: +- Jupyter: update Jupyter env for latest XClim, RavenPy and all packages + + Deploy new Jupyter env from PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/95 on PAVICS. + + Detailed changes can be found at https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/95. + + Relevant changes: + ```diff + < - xclim=0.31.0=pyhd8ed1ab_0 + > - xclim=0.32.1=pyhd8ed1ab_0 + + < - ravenpy=0.7.5=pyhff6ddc9_0 + > - ravenpy=0.7.8=pyh8a188c0_0 + + < - python=3.7.12=hb7a2778_100_cpython + > - python=3.8.12=hb7a2778_2_cpython + + # removed + < - vcs=8.2.1=pyh9f0ad1d_0 + + < - numpy=1.21.4=py37h31617e3_0 + > - numpy=1.21.5=py38h87f13fb_0 + + < - xarray=0.20.1=pyhd8ed1ab_0 + > - xarray=0.20.2=pyhd8ed1ab_0 + + < - rioxarray=0.8.0=pyhd8ed1ab_0 + > - rioxarray=0.9.1=pyhd8ed1ab_0 + + < - cf_xarray=0.6.1=pyh6c4a22f_0 + > - cf_xarray=0.6.3=pyhd8ed1ab_0 + + < - gdal=3.3.2=py37hd5a0ba4_2 + > - gdal=3.3.3=py38hcf2042a_0 + + < - rasterio=1.2.6=py37hc20819c_2 + > - rasterio=1.2.10=py38hfd64e68_0 + + < - climpred=2.1.6=pyhd8ed1ab_1 + > - climpred=2.2.0=pyhd8ed1ab_0 + + < - clisops=0.7.0=pyh6c4a22f_0 + > - clisops=0.8.0=pyh6c4a22f_0 + + < - xesmf=0.6.0=pyhd8ed1ab_0 + > - xesmf=0.6.2=pyhd8ed1ab_0 + + < - birdy=v0.8.0=pyh6c4a22f_1 + > - birdy=0.8.1=pyh6c4a22f_1 + + < - cartopy=0.20.0=py37hbe109c4_0 + > - cartopy=0.20.1=py38hf9a4893_1 + + < - dask=2021.11.2=pyhd8ed1ab_0 + > - dask=2022.1.0=pyhd8ed1ab_0 + + < - numba=0.53.1=py37hb11d6e1_1 + > - numba=0.55.0=py38h4bf6c61_0 + + < - pandas=1.3.4=py37he8f5f7f_1 + > - pandas=1.3.5=py38h43a58ef_0 + ``` + [1.18.4](https://github.com/bird-house/birdhouse-deploy/tree/1.18.4) (2022-01-25) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/default.env b/birdhouse/default.env index 081b6d89..4fcb8c36 100644 --- a/birdhouse/default.env +++ b/birdhouse/default.env @@ -2,7 +2,7 @@ # All env in this default.env must not depend on any env in env.local. # Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images -export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:211123-update211216" +export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:220121" # Name of the image displayed on the JupyterHub image selection page # Can be overriden in env.local to have a space separated list of multiple images, the name order must correspond From 6e40190987a1728f179f41fcf0aef584de239b4c Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 27 Jan 2022 09:37:29 -0500 Subject: [PATCH 9/9] =?UTF-8?q?Bump=20version:=201.18.4=20=E2=86=92=201.18?= =?UTF-8?q?.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGES.md | 5 +++++ README.rst | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e0d578a5..bad14bac 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.18.4 +current_version = 1.18.5 commit = True tag = False tag_name = {new_version} diff --git a/CHANGES.md b/CHANGES.md index da06b929..54ff505f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[1.18.5](https://github.com/bird-house/birdhouse-deploy/tree/1.18.5) (2022-01-27) +------------------------------------------------------------------------------------------------------------------ + ## Changes: - Jupyter: update Jupyter env for latest XClim, RavenPy and all packages diff --git a/README.rst b/README.rst index d61747ec..6d11a5a5 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.18.4.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.18.5.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.18.4...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.18.5...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.18.4-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.18.5-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.18.4 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.18.5 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version)