Merge pull request #14405 from tlm/2.9-into-develop

#14405

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

.github/workflows/static-analysis.yml

@@ -34,7 +34,8 @@ jobs:
         echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
 
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2
-
+        sudo snap install shfmt
+    
     - name: Download Dependencies
       run: go mod download
 

acceptancetests/repository/bundles-lxd-profile-upgrade.yaml

@@ -1,15 +1,15 @@
 series: bionic
 applications:
   lxd-profile:
-    charm: cs:~juju-qa/bionic/lxd-profile-without-devices-2
+    charm: juju-qa-lxd-profile-without-devices
     num_units: 4
     to:
       - "0"
       - "1"
       - "2"
       - "3"
   lxd-profile-subordinate:
-    charm: cs:~juju-qa/bionic/lxd-profile-subordinate-2
+    charm: juju-qa-lxd-profile-subordinate
   ubuntu:
     charm: cs:~jameinel/ubuntu-lite
     num_units: 4
@@ -24,5 +24,5 @@ machines:
   "2": {}
   "3": {}
 relations:
-- - lxd-profile:juju-info
+- - lxd-profile-without-devices:juju-info
   - lxd-profile-subordinate:juju-info

acceptancetests/repository/bundles-lxd-profile.yaml

@@ -6,7 +6,7 @@ machines:
   '3': {}
 applications:
   lxd-profile:
-    charm: cs:~juju-qa/bionic/lxd-profile-without-devices-5
+    charm: juju-qa-lxd-profile-without-devices
     num_units: 8
     to:
       - lxd:0

testcharms/charms/README.md

@@ -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.

testcharms/charms/appdata-sink/charmcraft.yaml

@@ -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

tests/suites/appdata/charms/appdata-sink/metadata.yaml → testcharms/charms/appdata-sink/metadata.yaml

@@ -1,5 +1,5 @@
 name: appdata-sink
-maintainer: Christian Muirhead <christian.muirhead@canonical.com>
+maintainer: Juju Crew <juju-crew@canonical.com>
 summary: Dummy charm that accepts application data
 description: |
   This dummy charm is used to verify that application-level relationship data is received correctly
@@ -9,5 +9,7 @@ provides:
 categories:
   - misc
 series:
-  - jammy
+  - xenial
+  - bionic
   - focal
+  - jammy

testcharms/charms/appdata-source/charmcraft.yaml

@@ -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

tests/suites/appdata/charms/appdata-source/metadata.yaml → testcharms/charms/appdata-source/metadata.yaml

@@ -1,5 +1,5 @@
 name: appdata-source
-maintainer: Christian Muirhead <christian.muirhead@canonical.com>
+maintainer: Juju Crew <juju-crew@canonical.com>
 summary: Dummy charm that provides application data
 description: |
   This dummy charm is used to verify that application-level relationship data is sent correctly
@@ -9,5 +9,7 @@ requires:
 categories:
   - misc
 series:
-  - jammy
+  - xenial
+  - bionic
   - focal
+  - jammy

testcharms/charms/lxd-profile-subordinate/charmcraft.yaml

@@ -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

acceptancetests/repository/charms/lxd-profile-subordinate/metadata.yaml → testcharms/charms/lxd-profile-subordinate/metadata.yaml

@@ -15,6 +15,8 @@ requires:
     interface: juju-info
     scope: container
 series:
-  - bionic
-  - xenial
   - quantal
+  - xenial
+  - bionic
+  - focal
+  - jammy

testcharms/charms/lxd-profile-without-devices/README.md

@@ -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

testcharms/charms/lxd-profile-without-devices/charmcraft.yaml

@@ -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

testcharms/charms/lxd-profile-without-devices/lxd-profile.yaml

@@ -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: ""
+

testcharms/charms/lxd-profile-without-devices/metadata.yaml

@@ -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
+

acceptancetests/repository/charms/lxd-profile/README → testcharms/charms/lxd-profile/README.md

@@ -1,14 +1,16 @@
 # Overview
 
-Start ubuntu image on a container with the included lxd profile.  Most useful when deploying to a container or an lxd cloud.
+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
 
 ## 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
+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
 

testcharms/charms/lxd-profile/charmcraft.yaml

@@ -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

testcharms/charms/lxd-profile/config.yaml

@@ -0,0 +1 @@
+options: {}

testcharms/charms/lxd-profile/hooks/update-status

@@ -0,0 +1,2 @@
+#!/bin/sh
+status-set active "$(uptime | grep -oe 'average: .*' | sed -e 's/average:/load:/')"