Merge branch 'canonical:main' into main

Author: cbartz

.github/pull_request_template.md

@@ -25,10 +25,8 @@ Applicable spec: <link>
 - [ ] The [charm style guide](https://juju.is/docs/sdk/styleguide) was applied.
 - [ ] The [contributing guide](https://github.com/canonical/is-charms-contributing-guide) was applied.
 - [ ] The changes are compliant with [ISD054 - Managing Charm Complexity](https://discourse.charmhub.io/t/specification-isd014-managing-charm-complexity/11619)
-- [ ] The documentation is generated using `src-docs`.
 - [ ] The documentation for charmhub is updated.
 - [ ] The PR is tagged with appropriate label (`urgent`, `trivial`, `complex`).
 - [ ] The changelog is updated with changes that affects the users of the charm.
-- [ ] The changes do not introduce any regression in code or tests related to LXD runner mode.
 
 <!-- Explanation for any unchecked items above -->

.github/workflows/e2e_test.yaml

@@ -2,7 +2,10 @@ name: End-to-End tests
 
 on:
   pull_request:
-  
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   # test option values defined at test/conftest.py are passed on via repository secret
@@ -13,7 +16,7 @@ jobs:
     secrets: inherit
     with:
       juju-channel: 3.6/stable
-      pre-run-script: scripts/setup-lxd.sh
+      pre-run-script: scripts/setup-integration-tests.sh
       provider: lxd
       test-tox-env: integration-juju3.6
       modules: '["test_e2e"]'

.github/workflows/e2e_test_run.yaml

@@ -12,37 +12,20 @@ on:
         description: The e2e test runner tag to run the workflow on.
         type: string
         required: true
-      runner-virt-type:
-        description: The e2e test runner virtualization type. E.g. lxd, or openstack.
-        # workflow_call does not support choice type.
-        type: string
-        required: true
   workflow_dispatch:
     inputs:
       runner-tag:
         description: The e2e test runner tag to run the workflow on.
         type: string
         required: true
-      runner-virt-type:
-        description: The e2e test runner virtualization type.
-        type: choice
-        required: true
-        options:
-          - lxd
-          - openstack
 
 jobs:
   e2e-test:
     name: End-to-End Test Run
     runs-on: [self-hosted, linux, "${{ inputs.runner-tag }}"]
     steps:
       - name: Hostname is set to "github-runner"
-        if: "${{ github.event.inputs.runner-virt-type == 'openstack' }}"
         run: sudo hostnamectl hostname | grep github-runner
-      # Snapd can have some issues in privileged LXD containers without setting
-      # security.nesting=True and this.
-      - name: Fix snap issue in privileged LXD containers
-        run: ln -s /bin/true /usr/local/bin/udevadm
       # Below is a series of simple tests to assess the functionality of the newly spawned runner.
       - name: Echo hello world
         run: echo "hello world"
@@ -104,11 +87,3 @@ jobs:
       # ~/.local/bin is added to path runner env through in scripts/env.j2
       - name: test check-jsonschema
         run: check-jsonschema --version
-      - name: Test Firewall
-        if: "${{ github.event.inputs.runner-virt-type == 'lxd' }}"
-        run: |
-          HOST_IP=$(ip route | grep default | cut -f 3 -d" ")
-          [ $((ping $HOST_IP -c 5 || :) | grep "Destination Port Unreachable" | wc -l) -eq 5 ]
-      - name: Test sctp support
-        if: "${{ github.event.inputs.runner-virt-type == 'lxd' }}"
-        run: sudo apt-get install lksctp-tools -yq && checksctp

.github/workflows/integration_test.yaml

@@ -3,41 +3,26 @@ name: integration-tests
 on:
   pull_request:
 
-  # Disabled until we get more resources for the actions
-  # schedule:
-  #   # Trigger at 6:00 AM and 6:00 PM UTC
-  #   - cron: "0 6,18 * * *"
+  schedule:
+    # Trigger at 6:00 AM and 6:00 PM UTC
+    - cron: "0 6,18 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
-  # test option values defined at test/conftest.py are passed on via repository secret
-  # INTEGRATION_TEST_ARGS to operator-workflows automatically.
-  integration-tests:
-    name: Integration test with juju 3.1
-    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
-    secrets: inherit
-    with:
-      juju-channel: 3.1/stable
-      pre-run-script: scripts/setup-lxd.sh
-      provider: lxd
-      test-tox-env: integration-juju3.1
-      modules: '["test_charm_scheduled_events", "test_debug_ssh", "test_charm_upgrade"]'
-      extra-arguments: "-m openstack"
-      self-hosted-runner: true
-      self-hosted-runner-label: stg-private-endpoint
   openstack-interface-tests-private-endpoint:
     name: openstack interface test using private-endpoint
     uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
     secrets: inherit
     with:
       juju-channel: 3.6/stable
-      pre-run-script: scripts/setup-lxd.sh
+      pre-run-script: scripts/setup-integration-tests.sh
       provider: lxd
       test-tox-env: integration-juju3.6
       modules: '["test_runner_manager_openstack"]'
+      extra-arguments: '--log-format="%(asctime)s %(levelname)s %(message)s"'
       self-hosted-runner: true
       self-hosted-runner-label: stg-private-endpoint
   openstack-integration-tests-private-endpoint:
@@ -46,17 +31,16 @@ jobs:
     secrets: inherit
     with:
       juju-channel: 3.6/stable
-      pre-run-script: scripts/setup-lxd.sh
+      pre-run-script: scripts/setup-integration-tests.sh
       provider: lxd
       test-tox-env: integration-juju3.6
-      modules: '["test_charm_metrics_failure", "test_charm_metrics_success", "test_charm_fork_repo", "test_charm_runner", "test_reactive"]'
-      extra-arguments: "-m openstack"
+      modules: '["test_charm_metrics_failure", "test_charm_metrics_success", "test_charm_fork_repo", "test_charm_fork_path_change", "test_charm_no_runner", "test_charm_runner", "test_debug_ssh", "test_charm_upgrade",  "test_reactive", "test_jobmanager_prespawned", "test_jobmanager_reactive"]'
+      extra-arguments: '-m openstack --log-format="%(asctime)s %(levelname)s %(message)s"'
       self-hosted-runner: true
       self-hosted-runner-label: stg-private-endpoint
   allure-report:
     if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
     needs:
-      - integration-tests
       - openstack-interface-tests-private-endpoint
       - openstack-integration-tests-private-endpoint
     uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main

.github/workflows/promote_charm.yaml

@@ -28,4 +28,5 @@ jobs:
       origin-channel: ${{ github.event.inputs.origin-channel }}
       destination-channel: ${{ github.event.inputs.destination-channel }}
       doc-automation-disabled: false
+      base-channel: '22.04'
     secrets: inherit