-
Notifications
You must be signed in to change notification settings - Fork 499
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'juju/2.9' into 2.9-into-develop
Conflicts: apiserver/facades/client/client/client_test.go testcharms/charms/appdata-sink/metadata.yaml testcharms/charms/appdata-source/metadata.yaml testcharms/charms/departer/.gitignore testcharms/charms/departer/.jujuignore testcharms/charms/departer/LICENSE testcharms/charms/departer/charmcraft.yaml testcharms/charms/departer/requirements.txt testcharms/charms/departer/revision testcharms/charms/departer/src/charm.py testcharms/charms/lxd-profile-subordinate/metadata.yaml tests/suites/deploy/bundles/lxd-profile-bundle.yaml tests/suites/deploy/deploy_charms.sh tests/suites/smoke/charms/ubuntu/metadata.yaml tests/suites/smoke/deploy.sh tests/suites/upgrade/charms/ubuntu/metadata.yaml upgrades/upgradevalidation/version_test.go
- Loading branch information
Showing
90 changed files
with
544 additions
and
883 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Charms Directory | ||
|
||
## Introduction | ||
This directory is responsible for holding all of the source code for the various | ||
charms that Juju uses during acceptance tests. Charms in this directory are | ||
likely to also be upload to Charmhub where they should almost always be used | ||
from. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
type: "charm" | ||
bases: | ||
- build-on: | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: ["amd64", "arm64"] | ||
run-on: | ||
- name: "ubuntu" | ||
channel: "16.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "18.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "22.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
parts: | ||
tiny-bash: | ||
plugin: dump | ||
source: . | ||
prime: | ||
- copyright | ||
- hooks | ||
- metadata.yaml |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
type: "charm" | ||
bases: | ||
- build-on: | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: ["amd64", "arm64"] | ||
run-on: | ||
- name: "ubuntu" | ||
channel: "16.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "18.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "22.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
parts: | ||
tiny-bash: | ||
plugin: dump | ||
source: . | ||
prime: | ||
- actions | ||
- actions.yaml | ||
- copyright | ||
- config.yaml | ||
- hooks | ||
- metadata.yaml |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
type: "charm" | ||
bases: | ||
- build-on: | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: ["amd64", "arm64"] | ||
run-on: | ||
- name: "ubuntu" | ||
channel: "16.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "18.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "22.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
parts: | ||
tiny-bash: | ||
plugin: dump | ||
source: . | ||
prime: | ||
- README.md | ||
- hooks | ||
- icon.svg | ||
- lxd-profile.yaml | ||
- metadata.yaml |
File renamed without changes.
File renamed without changes
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Overview | ||
|
||
Start ubuntu image on a container with the included lxd profile. Most useful | ||
when deploying to a container or an lxd cloud. | ||
|
||
# Usaage | ||
|
||
juju deploy lxd-profile-without-devices | ||
|
||
## Known Limitations and Issues | ||
|
||
It doesn't do much, but it does get you a machine you can play with. If not | ||
deployed to an LXD container or cloud, that functionality is a no-op. | ||
|
||
# Configuration | ||
|
||
None |
45 changes: 45 additions & 0 deletions
45
testcharms/charms/lxd-profile-without-devices/charmcraft.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
type: "charm" | ||
bases: | ||
- build-on: | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: ["amd64", "arm64"] | ||
run-on: | ||
- name: "ubuntu" | ||
channel: "16.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "18.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "22.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
parts: | ||
tiny-bash: | ||
plugin: dump | ||
source: . | ||
prime: | ||
- README.md | ||
- config.yaml | ||
- hooks | ||
- lxd-profile.yaml | ||
- metadata.yaml |
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions
8
testcharms/charms/lxd-profile-without-devices/lxd-profile.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#name: juju-default | ||
description: lxd profile for testing | ||
config: | ||
security.nesting: "true" | ||
security.privileged: "true" | ||
linux.kernel_modules: ip_tables,ip6_tables | ||
environment.http_proxy: "" | ||
|
20 changes: 20 additions & 0 deletions
20
testcharms/charms/lxd-profile-without-devices/metadata.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
name: lxd-profile-without-devices | ||
summary: start a juju machine with a lxd profile that has no devices | ||
maintainer: Juju Crew <juju-crew@canonical.com> | ||
description: | | ||
Run an Ubuntu system, with the given lxd-profile | ||
provides: | ||
ubuntu: | ||
interface: ubuntu | ||
extra-bindings: | ||
another: | ||
tags: | ||
- misc | ||
- application_development | ||
subordinate: false | ||
series: | ||
- xenial | ||
- bionic | ||
- focal | ||
- jammy | ||
|
6 changes: 4 additions & 2 deletions
6
...ests/repository/charms/lxd-profile/README → testcharms/charms/lxd-profile/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
type: "charm" | ||
bases: | ||
- build-on: | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: ["amd64", "arm64"] | ||
run-on: | ||
- name: "ubuntu" | ||
channel: "16.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "18.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "20.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
- name: "ubuntu" | ||
channel: "22.04" | ||
architectures: | ||
- amd64 | ||
- aarch64 | ||
- arm64 | ||
- s390x | ||
parts: | ||
tiny-bash: | ||
plugin: dump | ||
source: . | ||
prime: | ||
- README.md | ||
- config.yaml | ||
- hooks | ||
- icon.svg | ||
- lxd-profile.yaml | ||
- metadata.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
options: {} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#!/bin/sh | ||
status-set active "$(uptime | grep -oe 'average: .*' | sed -e 's/average:/load:/')" |
File renamed without changes
File renamed without changes.
Oops, something went wrong.