DLPX-91090 cloud-init merge conflict

delphix · May 10, 2024 · 0eee81f · 0eee81f
2 parents 41b9123 + ec4dd51
commit 0eee81f
Show file tree

Hide file tree

Showing 439 changed files with 23,874 additions and 6,993 deletions.
diff --git a/.github/workflows/check_format.yml b/.github/workflows/check_format.yml
@@ -87,10 +87,12 @@ jobs:
       - name: "Install dependencies"
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox lintian
+          sudo DEBIAN_FRONTEND=noninteractive apt-get -qy install tox
       - name: "Spellcheck"
         run: |
-          make check_spelling
+          tox
+        env:
+          TOXENV: doc-spelling
       - name: "Build docs"
         env:
           TOXENV: doc

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -17,7 +17,7 @@ defaults:
     shell: sh -ex {0}
 
 env:
-  RELEASE: bionic
+  RELEASE: focal
 
 jobs:
   package-build:

diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
@@ -37,6 +37,8 @@ jobs:
           broken_count=$(grep -c "broken" output.txt)
           if [[ $broken_count -ge 5 ]]; then
             echo "Too many broken links detected: $broken_count"
+            broken_matches=$(grep "broken" output.txt)
+            echo "Broken links \n$broken_matches"
             exit 1
           else
             echo "Number of broken links is below threshold: $broken_count"

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -14,29 +14,37 @@ jobs:
   unittests:
     strategy:
       matrix:
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ]
-        toxenv: [ py3 ]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        toxenv: [py3]
         experimental: [false]
+        check-latest: [false]
+        continue-on-error: [false]
         include:
           - python-version: "3.6"
             toxenv: lowest-supported
+            continue-on-error: false
+            check-latest: false
             experimental: false
+          - python-version: "3.13-dev"
+            toxenv: py3
+            check-latest: true
+            experimental: true
+            continue-on-error: true
     name: unittest / ${{ matrix.toxenv }} / python ${{matrix.python-version}}
     runs-on: ubuntu-20.04
     continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch all tags for tools/read-version
           fetch-depth: 0
       - name: Install Python ${{matrix.python-version}}
         uses: actions/setup-python@v4
         with:
           python-version: ${{matrix.python-version}}
+          check-latest: ${{matrix.check-latest}}
       - name: Install tox
         run: pip install tox
       - name: Run unittest
-        env:
-          PYTEST_ADDOPTS: -v
         run: tox -e ${{ matrix.toxenv }}
diff --git a/.pc/applied-patches b/.pc/applied-patches
@@ -3,7 +3,10 @@ expire-on-hashed-users.patch
 retain-netplan-world-readable.patch
 netplan99-cannot-use-default.patch
 retain-old-groups.patch
+keep-dhclient-as-priority-client.patch
+revert-551f560d-cloud-config-after-snap-seeding.patch
 do-not-block-user-login.patch
 status-do-not-remove-duplicated-data.patch
 retain-apt-pre-deb822.patch
 status-retain-recoverable-error-exit-code.patch
+retain-ec2-default-net-update-events.patch
diff --git a/.pc/expire-on-hashed-users.patch/cloudinit/features.py b/.pc/expire-on-hashed-users.patch/cloudinit/features.py
@@ -62,7 +62,7 @@
 NETPLAN_CONFIG_ROOT_READ_ONLY = True
 """
 If ``NETPLAN_CONFIG_ROOT_READ_ONLY`` is True, then netplan configuration will
-be written as a single root readon-only file /etc/netplan/50-cloud-init.yaml.
+be written as a single root read-only file /etc/netplan/50-cloud-init.yaml.
 This prevents wifi passwords in network v2 configuration from being
 world-readable. Prior to 23.1, netplan configuration is world-readable.
 

diff --git a/.pc/expire-on-hashed-users.patch/tests/unittests/config/test_cc_set_passwords.py b/.pc/expire-on-hashed-users.patch/tests/unittests/config/test_cc_set_passwords.py
@@ -12,7 +12,11 @@
     get_schema,
     validate_cloudconfig_schema,
 )
-from tests.unittests.helpers import does_not_raise, skipUnlessJsonSchema
+from tests.unittests.helpers import (
+    SCHEMA_EMPTY_ERROR,
+    does_not_raise,
+    skipUnlessJsonSchema,
+)
 from tests.unittests.util import get_cloud
 
 MODPATH = "cloudinit.config.cc_set_passwords."
@@ -718,7 +722,8 @@ class TestSetPasswordsSchema:
             (
                 {"chpasswd": {"list": []}},
                 pytest.raises(
-                    SchemaValidationError, match=r"\[\] is too short"
+                    SchemaValidationError,
+                    match=rf"\[\] {SCHEMA_EMPTY_ERROR}",
                 ),
             ),
         ],