Merge ~vultaire/charm-juju-autoreg:focal-support into charm-juju-autoreg:master

Proposed by Paul Goins
Status: Rejected
Rejected by: Drew Freiberger
Proposed branch: ~vultaire/charm-juju-autoreg:focal-support
Merge into: charm-juju-autoreg:master
Prerequisite: ~vultaire/charm-juju-autoreg:functest-fixes
Diff against target: 39 lines (+4/-0)
4 files modified
metadata.yaml (+1/-0)
tests/bundles/focal.yaml (+1/-0)
tests/bundles/overlays/focal.yaml.j2 (+1/-0)
tests/tests.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Xav Paice (community) Needs Fixing
Review via email: mp+384438@code.launchpad.net

This proposal supersedes a proposal from 2020-05-22.

To post a comment you must log in.
Revision history for this message
Paul Goins (vultaire) wrote :

Slightly cleaned up this branch and its dependency branch; some of the work was intertwined.

ad3acb4... by Paul Goins

Updated focal bundles

This is the remaining parts of the previous "Updated bundles" commit.

Revision history for this message
Paul Goins (vultaire) wrote :

Did a bunch more cleanup as Xav quite correctly pointed out that I didn't have all the needed test changes in the actual test changes MR. Now this MR is purely for focal support.

And, because of the outstanding issues re: userdir-ldap focal support, this should not be merged until those issues are resolved.

Revision history for this message
Xav Paice (xavpaice) wrote :

Waiting for userdir-ldap to support focal, till then this can't be merged.

Before the next round of reviews, this change will need a rebase.

review: Needs Fixing
Revision history for this message
Celia Wang (ziyiwang) wrote :

This MR can be now closed. Focal support has been added for this charm.

Revision history for this message
Drew Freiberger (afreiberger) wrote :

Marked rejected as these changes are already in the code base.

Unmerged commits

ad3acb4... by Paul Goins

Updated focal bundles

This is the remaining parts of the previous "Updated bundles" commit.

6871eb8... by Paul Goins

Removed focal.yaml.j2

0b83214... by Paul Goins

Updated charm dependency reference

e9271e7... by Paul Goins

Updated charm-userdir-ldap for new name and git repo

21cf06b... by Paul Goins

Adding focal support

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/metadata.yaml b/metadata.yaml
2index 8803028..e8d34c7 100644
3--- a/metadata.yaml
4+++ b/metadata.yaml
5@@ -14,6 +14,7 @@ requires:
6 interface: juju-info
7 scope: container
8 series:
9+ - focal
10 - bionic
11 - xenial
12 resources:
13diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml
14new file mode 120000
15index 0000000..f81f6ff
16--- /dev/null
17+++ b/tests/bundles/focal.yaml
18@@ -0,0 +1 @@
19+base.yaml
20\ No newline at end of file
21diff --git a/tests/bundles/overlays/focal.yaml.j2 b/tests/bundles/overlays/focal.yaml.j2
22new file mode 100644
23index 0000000..d3f46ab
24--- /dev/null
25+++ b/tests/bundles/overlays/focal.yaml.j2
26@@ -0,0 +1 @@
27+series: focal
28diff --git a/tests/tests.yaml b/tests/tests.yaml
29index b5f5bc5..32fcca7 100644
30--- a/tests/tests.yaml
31+++ b/tests/tests.yaml
32@@ -3,6 +3,7 @@ tests:
33 - tests.tests_charm_autoreg.CharmAutoregTest
34 - zaza.openstack.charm_tests.security.tests.FileOwnershipTest
35 gate_bundles:
36+ - focal
37 - bionic
38 target_deploy_status:
39 autoreg:

Subscribers

People subscribed via source and target branches