Jammy upstream snapshot and new patch

.github/actionlint.yml

@@ -0,0 +1,6 @@
+".github/workflows/**/weekly-tics.yml":
+  ignore:
+  # Ignore self-hosted runner labels we use as an organization
+  - "label (amd64|tiobe|noble) is unknown.+""
+
+

.github/workflows/_integration_common.yml

@@ -0,0 +1,118 @@
+name: "Daily: Integration (reusable/manual)"
+
+on:
+  workflow_dispatch:
+    inputs:
+      release:
+        required: true
+        type: choice
+        options:
+        - questing
+        - jammy
+        - noble
+        - resolute
+      platform:
+        required: true
+        type: choice
+        options:
+        - lxd_container
+        - lxd_vm
+      image_type:
+        type: choice
+        options:
+        - generic
+        - minimal
+        required: false
+      install_source:
+        required: false
+        type: string
+      filter_tests:
+        required: false
+        type: string
+  workflow_call:
+    inputs:
+      release:
+        required: true
+        type: string
+      platform:
+        required: true
+        type: string
+      image_type:
+        required: false
+        type: string
+      install_source:
+        required: false
+        type: string
+      filter_tests:
+        required: false
+        type: string
+
+jobs:
+  lxc:
+    runs-on: ubuntu-latest
+
+    env:
+      CLOUD_INIT_PLATFORM: ${{ inputs.platform || 'lxd_container' }}
+      CLOUD_INIT_OS_IMAGE: ${{ inputs.release || 'questing' }}
+      CLOUD_INIT_OS_IMAGE_TYPE: ${{ inputs.image_type || 'generic' }}
+      CLOUD_INIT_CLOUD_INIT_SOURCE: ${{ inputs.install_source || 'ppa:cloud-init-dev/daily' }}
+      CLOUD_INIT_LOCAL_LOG_PATH: ${{ github.workspace }}/cloud_init_test_logs
+
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+      - name: Setup LXD
+        uses: canonical/setup-lxd@8c6a87bfb56aa48f3fb9b830baa18562d8bfd4ee # v0.1.2
+        with:
+          channel: 6/stable
+      - name: Clean workspace
+        run: |
+          rm -rf ${{ github.workspace }}/cloud_init_test_logs/
+      - name: Setup pycloudlib
+        run: |
+          ssh-keygen -P "" -q -f ~/.ssh/id_rsa
+          echo "[lxd]" > /home/$USER/.config/pycloudlib.toml
+      - name: Install Dependencies
+        run: |
+          sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update
+          sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox distro-info-data
+      - name: Run integration Tests
+        run: |
+          tox -e integration-tests -- --junitxml="${{ github.workspace }}/reports/junit-report-${{ inputs.platform }}-${{ inputs.release }}.xml" --color=yes ${{ inputs.filter_tests || 'tests/integration_tests' }}
+      - name: Publish Test Report with Insights
+        if: always()
+        uses: ctrf-io/github-test-reporter@024bc4b64d997ca9da86833c6b9548c55c620e40 # v1.0.26
+        with:
+          report-path: '${{ github.workspace }}/reports/junit-report-${{ inputs.platform}}-${{ inputs.release }}.xml'
+          integrations-config: |
+            {
+              "junit-to-ctrf": {
+                "enabled": true,
+                "action": "convert",
+                "options": {
+                  "output": "./reports/ctrf-report-${{ inputs.platform }}-${{ inputs.release }}-${{ inputs.image_type }}.json",
+                  "toolname": "junit-to-ctrf",
+                  "useSuiteName": false,
+                  "env": {
+                    "appName": "my-app"
+                  }
+                }
+              }
+            }
+          summary-delta-report: true
+          insights-report: true
+          flaky-rate-report: true
+          slowest-report: true
+          upload-artifact: true
+          github-report: true
+          artifact-name: ctrf-report-${{ inputs.platform }}-${{inputs.release}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload failure artifacts
+        if: failure()
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: failure-${{ github.job }}
+          path: ${{ github.workspace }}/cloud_init_test_logs/
+          retention-days: 2

.github/workflows/check_format.yml → .github/workflows/ci-check-format.yml

@@ -1,4 +1,4 @@
-name: Lint Tests
+name: Lint
 on:
   pull_request:
   push:
@@ -20,14 +20,11 @@ jobs:
         env: [ruff, mypy, pylint, black, isort]
     name: Check ${{ matrix.env }}
     runs-on: ubuntu-latest
+    env:
+      FORCE_COLOR: 1
     steps:
-      - name: "Checkout #1"
-        uses: actions/checkout@v4
-
-      - name: "Checkout #2 (for tools/read-version)"
-        run: |
-          git fetch --unshallow
-          git remote add upstream https://git.launchpad.net/cloud-init
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
       - name: Dependencies
         run: |
@@ -48,10 +45,10 @@ jobs:
     name: Check json format
     runs-on: ubuntu-24.04
     steps:
-      - name: "Checkout #1"
-        uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
-      - name: "Test format"
+      - name: Test format
         run: |
           tools/check_json_format.sh cloudinit/config/schemas/schema-cloud-config-v1.json
           tools/check_json_format.sh cloudinit/config/schemas/schema-network-config-v1.json
@@ -63,27 +60,22 @@ jobs:
     name: Check docs
     runs-on: ubuntu-24.04
     steps:
-      - name: "Checkout #1"
-        uses: actions/checkout@v4
-
-      - name: "Checkout #2 (for tools/read-version)"
-        run: |
-          git fetch --unshallow
-          git remote add upstream https://git.launchpad.net/cloud-init
-      - name: "Install Python 3.11.9"
-        uses: actions/setup-python@v5
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+      - name: Install RTD Python Version
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
           python-version: '3.11.9'
-      - name: "Install dependencies"
+      - name: Install dependencies
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox
-      - name: "Spellcheck"
+      - name: Spellcheck
         run: |
           tox
         env:
           TOXENV: doc-spelling
-      - name: "Build docs"
+      - name: Build docs
         env:
           TOXENV: doc
         run: |
@@ -94,7 +86,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
       - name: Install ShellCheck
         run: |
@@ -103,4 +95,13 @@ jobs:
 
       - name: Run ShellCheck
         run: |
-          shellcheck ./tools/ds-identify
+          shellcheck --color=always ./tools/ds-identify
+
+  workflow-lint:
+    name: GitHub Action and Workflow Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+      - uses: reviewdog/action-actionlint@83e4ed25b168066ad8f62f5afbb29ebd8641d982 # v1.69.1
+        with:
+          fail_level: any

.github/workflows/integration.yml → .github/workflows/ci-integration.yml

@@ -1,4 +1,4 @@
-name: Integration Tests
+name: Integration
 
 on:
   pull_request:
@@ -23,11 +23,8 @@ jobs:
   build-package-and-run-tests:
     runs-on: ubuntu-24.04
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4
-        with:
-          # Fetch all tags for tools/read-version
-          fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       - name: Prepare dependencies
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -48,13 +45,13 @@ jobs:
           DEB_BUILD_OPTIONS=nocheck ./packages/bddeb -d --release ${{ env.RELEASE }}
           cp cloud-init_all.deb ${{ runner.temp }}
       - name: Archive debs as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f  # v6.0.0
         with:
           name: 'cloud-init-${{ env.RELEASE }}-deb'
           path: '${{ runner.temp }}/cloud-init*.deb'
           retention-days: 3
       - name: Setup LXD
-        uses: canonical/setup-lxd@v0.1.2
+        uses: canonical/setup-lxd@8c6a87bfb56aa48f3fb9b830baa18562d8bfd4ee  # v1
         with:
           channel: 6/stable
       - name: Verify deb package

.github/workflows/alpine-unittests.yml → .github/workflows/ci-unit-distro.yml

@@ -1,5 +1,4 @@
-
-name: Alpine Unittests
+name: "Unit: Alternate Distros"
 
 on:
   pull_request:
@@ -22,14 +21,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: "Checkout"
-        uses: actions/checkout@v4
-        with:
-          # Fetch all tags for tools/read-version
-          fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
-      - name: Setup LXD
-        uses: canonical/setup-lxd@v0.1.2
+      - name: Set up LXD
+        uses: canonical/setup-lxd@8c6a87bfb56aa48f3fb9b830baa18562d8bfd4ee  # v1
 
       - name: Create alpine container
         # the current shell doesn't have lxd as one of the groups
@@ -69,4 +65,4 @@ jobs:
         run: lxc exec alpine -- ifdown -a
 
       - name: Run unittests
-        run: lxc exec alpine --cwd /root/cloud-init-rw -- sh -c 'tox -e py3 -- --color=yes'
+        run: lxc exec alpine --cwd /root/cloud-init-rw -- sh -c 'TMPDIR=. tox -e py3 -- --color=yes'

.github/workflows/unit.yml → .github/workflows/ci-unit-python.yml

@@ -1,4 +1,4 @@
-name: Unit Tests
+name: "Unit: Python Versions"
 on:
   pull_request:
   push:
@@ -14,7 +14,7 @@ jobs:
   unittests:
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         toxenv: [py3]
         slug: [""]
         experimental: [false]
@@ -31,13 +31,10 @@ jobs:
     runs-on: ubuntu-24.04
     continue-on-error: ${{ matrix.experimental }}
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4
-        with:
-          # Fetch all tags for tools/read-version
-          fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       - name: Install Python ${{matrix.python-version}}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
           python-version: ${{matrix.python-version}}
           check-latest: ${{matrix.check-latest}}

.github/workflows/daily-integration-jammy-lxd-container.yml

@@ -0,0 +1,13 @@
+name: "Daily: Integration Jammy lxd_container"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '2 22 * * *'
+
+jobs:
+  jammy-lxd_container:
+    uses: ./.github/workflows/_integration_common.yml
+    with:
+      release: jammy
+      platform: lxd_container

.github/workflows/daily-integration-noble-lxd-container.yml

@@ -0,0 +1,13 @@
+name: "Daily: Integration Noble lxd_container"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '2 22 * * *'
+
+jobs:
+  noble-lxd_container:
+    uses: ./.github/workflows/_integration_common.yml
+    with:
+      release: noble
+      platform: lxd_container

.github/workflows/daily-integration-questing-lxd-container.yml

@@ -0,0 +1,13 @@
+name: "Daily: Integration Questing lxd_container"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '2 22 * * *'
+
+jobs:
+  questing-lxd_container:
+    uses: ./.github/workflows/_integration_common.yml
+    with:
+      release: questing
+      platform: lxd_container

.github/workflows/daily-integration-resolute-lxd-container.yml

@@ -0,0 +1,13 @@
+name: "Daily: Integration Resolute lxd_container"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '2 22 * * *'
+
+jobs:
+  resolute-lxd_container:
+    uses: ./.github/workflows/_integration_common.yml
+    with:
+      release: resolute
+      platform: lxd_container