Merge lp:~hloeung/ubuntu-repository-cache/charm-env-fixes into lp:ubuntu-repository-cache

[Haw Loeung]

Switch to the charm-env shipped with the charm, it's the latest and fixes GH#144

The latest charm-env fixes these import warnings/errors:

| root@machine-0:/etc/cron.d# . /etc/repository-sync/ubuntu-repository-cache && run-one /usr/local/sbin/charm-env --charm ubuntu-repository-cache | python3 -m ubuntu_repository_cache.metadata_sync
| Traceback (most recent call last):
| File "<string>", line 1, in <module>
| ModuleNotFoundError: No module named 'charmhelpers'
| Traceback (most recent call last):
| File "<string>", line 1, in <module>
| ModuleNotFoundError: No module named 'charmhelpers'

This is https://github.com/juju-solutions/layer-basic/commit/0845a8429aae4eb1c32131ef37235f2ac196676c

Sadly, /usr/local/sbin/charm-env is rarely updated, likely shipped out on unit provision / charm install. Switch to the version shipped out with the charm instead.

[Canonical IS Mergebot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~hloeung/ubuntu-repository-cache/charm-env-fixes]

289. By Haw Loeung on 2020-10-13

Cron job too

[Thomas Cuthbert (tcuthbert)]

LGTM +1

review: Approve

[Canonical IS Mergebot (canonical-is-mergebot)]

Change successfully merged at revision 288

=== modified file 'lib/ubuntu_repository_cache/metadata_sync.py'
--- lib/ubuntu_repository_cache/metadata_sync.py	2020-10-06 10:04:18 +0000
+++ lib/ubuntu_repository_cache/metadata_sync.py	2020-10-13 04:39:12 +0000
@@ -274,8 +274,9 @@
 
     # Call the sync hook inside the juju environment to propagate changes to
     # other units
-    path = '/usr/local/sbin/charm-env /var/lib/juju/agents/{}/charm/hooks/ubuntu-repository-cache-sync {}'
-    path = path.format(unit_path, meta_ver)
+    charm_env = '/var/lib/juju/agents/{}/charm/bin/charm-env'.format(unit_path)
+    path = '{} /var/lib/juju/agents/{}/charm/hooks/ubuntu-repository-cache-sync {}'
+    path = path.format(charm_env, unit_path, meta_ver)
     cmd = ['juju-run', local_unit, path]
 
     log("Executing hook: {}".format(cmd))

=== modified file 'lib/ubuntu_repository_cache/service.py'
--- lib/ubuntu_repository_cache/service.py	2020-10-06 10:04:18 +0000
+++ lib/ubuntu_repository_cache/service.py	2020-10-13 04:39:12 +0000
@@ -276,6 +276,7 @@
         cron_context['UnitPath'] = '-'.join(('unit', hookenv.local_unit().replace('/', '-')))
         cron_context['MirrorSeries'] = config['mirror-series'].strip()
         cron_context['ConfigPath'] = urc_config_path
+        cron_context['CharmEnvPath'] = os.path.join(hookenv.charm_dir(), 'bin', 'charm-env')
         templating.render('cron/ubuntu-repository-cache_rsync.cron', cron_filename, cron_context)
         templating.render('cron/ubuntu-repository-cache-config', urc_config_path, cron_context)
     else:

=== modified file 'lib/ubuntu_repository_cache/tests/test_metadata_sync.py'
--- lib/ubuntu_repository_cache/tests/test_metadata_sync.py	2020-10-06 10:04:18 +0000
+++ lib/ubuntu_repository_cache/tests/test_metadata_sync.py	2020-10-13 04:39:12 +0000
@@ -187,7 +187,7 @@
                     [
                         'juju-run',
                         'unit/0',
-                        '/usr/local/sbin/charm-env '
+                        '/var/lib/juju/agents/something/charm/bin/charm-env '
                         '/var/lib/juju/agents/something/charm/hooks/'
                         'ubuntu-repository-cache-sync some_meta_var',
                     ],

=== modified file 'templates/cron/ubuntu-repository-cache_rsync.cron'
--- templates/cron/ubuntu-repository-cache_rsync.cron	2020-07-09 02:35:50 +0000
+++ templates/cron/ubuntu-repository-cache_rsync.cron	2020-10-13 04:39:12 +0000
@@ -1,4 +1,4 @@
 # This cronjob will make the leader sync its view of the metadata with upstream
 # It will then trigger a juju-run to let its peers synchronise.
-{{ Minutes }} * * * * root . {{ ConfigPath }} && run-one /usr/local/sbin/charm-env --charm ubuntu-repository-cache python3 -m ubuntu_repository_cache.metadata_sync
+{{ Minutes }} * * * * root . {{ ConfigPath }} && run-one {{ CharmEnvPath }} --charm ubuntu-repository-cache python3 -m ubuntu_repository_cache.metadata_sync