Merge remote-tracking branch 'origin/upstreams/develop' into merge

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: "Get Help"
     about: "Links to documentation and community support"
-    url: "https://cloudinit.readthedocs.io/en/latest/#project-and-community"
+    url: "https://docs.cloud-init.io/en/latest/#project-and-community"

.github/labeler.yml

@@ -1,7 +1,18 @@
+# Changes to labeler do not run in pull requests because this only runs against
+# the base branch by default
+#
+# https://github.com/actions/labeler/tree/main?tab=readme-ov-file#initial-set-up-of-the-labeler-action
 documentation:
 - all:
   - changed-files:
     - any-glob-to-any-file:
       - 'doc/**'
       - 'cloudinit/config/schemas/**'
   - base-branch: ['main']
+packaging:
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'debian/**'
+  - base-branch: ['ubuntu/*']
+

.github/workflows/alpine-unittests.yml

@@ -71,4 +71,4 @@ jobs:
         run: lxc exec alpine -- ifdown -a
 
       - name: Run unittests
-        run: lxc exec alpine --cwd /root/cloud-init-rw -- tox -e py3
+        run: lxc exec alpine --cwd /root/cloud-init-rw -- sh -c 'tox -e py3 -- --color=yes'

.github/workflows/check_format.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout #1"
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4
 
       - name: "Checkout #2 (for tools/read-version)"
         run: |
@@ -46,10 +46,10 @@ jobs:
     strategy:
       fail-fast: false
     name: Check json format
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout #1"
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4
 
       - name: "Test format"
         run: |
@@ -61,19 +61,19 @@ jobs:
     strategy:
       fail-fast: false
     name: Check docs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout #1"
-        uses: actions/checkout@v3.0.0
+        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.10"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10.8'
+          python-version: '3.11.9'
       - name: "Install dependencies"
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update
@@ -91,10 +91,10 @@ jobs:
 
   shell-lint:
     name: Shell Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4
 
       - name: Install ShellCheck
         run: |
@@ -106,9 +106,9 @@ jobs:
           shellcheck ./tools/ds-identify
 
   check-cla-signers:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3.0.0
+      - uses: actions/checkout@v4
 
       - name: Check CLA signers file
         run: tools/check-cla-signers

.github/workflows/integration.yml

@@ -17,73 +17,55 @@ defaults:
     shell: sh -ex {0}
 
 env:
-  RELEASE: focal
+  RELEASE: plucky
 
 jobs:
-  package-build:
-    runs-on: ubuntu-22.04
+  build-package-and-run-tests:
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch all tags for tools/read-version
           fetch-depth: 0
       - name: Prepare dependencies
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
-            debhelper \
-            dh-python \
-            fakeroot \
-            python3-setuptools \
-            sbuild \
-            ubuntu-dev-tools
-          sudo sbuild-adduser $USER
-          cp /usr/share/doc/sbuild/examples/example.sbuildrc /home/$USER/.sbuildrc
-          # Install all build and test dependencies
-          ./tools/read-dependencies -r requirements.txt -r test-requirements.txt -d ubuntu -s -i
+            ubuntu-dev-tools \
+            tox \
+            wireguard \
+            $(\
+              ./tools/read-dependencies                   \
+                --requirements-file requirements.txt      \
+                --requirements-file test-requirements.txt \
+                --distro ubuntu                           \
+                --system-pkg-names 2> /dev/null           \
+                | tr '\n' ' '                             \
+            )
       - name: Build package
         run: |
-          ./packages/bddeb -S -d --release ${{ env.RELEASE }}
-          sudo -E su $USER -c 'mk-sbuild ${{ env.RELEASE }}'
-          sudo -E su $USER -c 'DEB_BUILD_OPTIONS=nocheck sbuild --nolog --no-run-lintian --no-run-autopkgtest --verbose --dist=${{ env.RELEASE }} --build-dir=${{ runner.temp }} cloud-init_*.dsc'
+          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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'cloud-init-${{ env.RELEASE }}-deb'
           path: '${{ runner.temp }}/cloud-init*.deb'
           retention-days: 3
-
-  integration-tests:
-    needs: package-build
-    runs-on: ubuntu-22.04
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v3
-        with:
-          # Fetch all tags for tools/read-version
-          fetch-depth: 0
-      - name: Retrieve cloud-init package
-        uses: actions/download-artifact@v3
+      - name: Setup LXD
+        uses: canonical/[email protected]
         with:
-          name: 'cloud-init-${{ env.RELEASE }}-deb'
+          channel: latest/candidate
       - name: Verify deb package
         run: |
-          ls -hal cloud-init*.deb
-      - name: Prepare test tools
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get -y install tox wireguard
-      - name: Initialize LXD
+          ls -hal '${{ runner.temp }}'
+          echo ${{ runner.temp }}/cloud-init*.deb || true
+          ls -hal ${{ runner.temp }}/cloud-init*.deb || true
+      - name: Set up Pycloudlib
         run: |
           ssh-keygen -P "" -q -f ~/.ssh/id_rsa
           echo "[lxd]" > /home/$USER/.config/pycloudlib.toml
-          sudo adduser $USER lxd
-          # Jammy GH Action runners have docker installed, which edits iptables
-          # in a way that is incompatible with lxd.
-          # https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker
-          sudo iptables -I DOCKER-USER -j ACCEPT
-          sudo lxd init --auto
       - name: Run integration Tests
         run: |
-          sg lxd -c 'CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls cloud-init*.deb)" tox -e integration-tests-ci'
+          CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls ${{ runner.temp }}/cloud-init*.deb)" CLOUD_INIT_OS_IMAGE=${{ env.RELEASE }} tox -e integration-tests-ci -- --color=yes tests/integration_tests/

.github/workflows/linkcheck.yml

@@ -8,15 +8,15 @@ concurrency:
 
 jobs:
   linkcheck:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: ${{ !(github.event_name == 'workflow_dispatch' && github.event.inputs.failOnError == 'true') }}
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4
 
       - name: "Install Python 3.10"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10.8'
 

.github/workflows/packaging-tests.yml

@@ -1,4 +1,4 @@
-name: Packaging Tests
+name: Packaging
 
 on:
   pull_request:
@@ -18,13 +18,15 @@ env:
 
 jobs:
   check-patches:
-    runs-on: ubuntu-22.04
+    name: Check patches
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch all branches for merging
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Prepare dependencies
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -34,14 +36,17 @@ jobs:
           echo 'QUILT_PATCHES=debian/patches' >> ~/.quiltrc
           echo 'QUILT_SERIES=debian/patches/series' >> ~/.quiltrc
 
-      - name: 'Daily recipe: quilt patches apply successfully and tests run'
+      - name: Configure git and merge
         run: |
           git config user.name "GitHub Actions"
           git config user.email "[email protected]"
-          git remote add upstream https://git.launchpad.net/cloud-init
-          git fetch upstream main
-          git checkout upstream/main
-          git merge ${{ github.sha }}
+          git merge origin/main
+      - name: Quilt patches apply successfully and tests run
+        run: |
+          if [ ! -f debian/patches/series ]; then
+            echo "no patches, skipping"
+            exit 0
+          fi
           quilt push -a
           tox -e py3
           quilt pop -a

.github/workflows/scheduled.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
@@ -25,15 +25,17 @@ jobs:
           HYPOTHESIS_PROFILE: ci
         run: tox -e hypothesis-slow
   devel_tests:
-    name: unittest / 3.13-dev
+    name: unittest / 3.14-dev
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install Python 3.13-dev
-        uses: actions/setup-python@v4
+        uses: actions/checkout@v4
+      - name: Install Python 3.14-dev
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.13-dev
+          # select latest version here:
+          # https://github.com/actions/python-versions/blob/main/versions-manifest.json
+          python-version: 3.14-dev
           check-latest: true
       - name: Install tox
         run: pip install tox
@@ -48,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           sudo apt-get -qy update

.github/workflows/unit.yml

@@ -14,7 +14,7 @@ jobs:
   unittests:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         toxenv: [py3]
         slug: [""]
         experimental: [false]
@@ -28,7 +28,7 @@ jobs:
             check-latest: false
             experimental: false
     name: Python ${{matrix.python-version}} ${{ matrix.slug }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: "Checkout"
@@ -37,11 +37,11 @@ jobs:
           # Fetch all tags for tools/read-version
           fetch-depth: 0
       - name: Install Python ${{matrix.python-version}}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{matrix.python-version}}
           check-latest: ${{matrix.check-latest}}
       - name: Install tox
         run: pip install tox
       - name: Run unittest
-        run: tox -e ${{ matrix.toxenv }}
+        run: tox -e ${{ matrix.toxenv }} -- --color=yes

.pc/applied-patches

@@ -10,7 +10,8 @@ retain-apt-pre-deb822.patch
 status-retain-recoverable-error-exit-code.patch
 retain-ec2-default-net-update-events.patch
 cli-retain-file-argument-as-main-cmd-arg.patch
-drop-unsupported-systemd-condition-environment.patch
 deprecation-version-boundary.patch
 no-single-process.patch
+drop-unsupported-systemd-condition-environment.patch
 no-nocloud-network.patch
+grub-dpkg-support.patch