diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index c089326e17..f0b41b7de4 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -29,7 +29,7 @@ jobs: checks-with-ci-repo: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml index e9a335baf8..f25e2bf71b 100644 --- a/.github/workflows/fedora.yml +++ b/.github/workflows/fedora.yml @@ -76,7 +76,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev steps: - uses: actions/checkout@v3 @@ -111,7 +111,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e21d922427..83ae6bf92d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev steps: - uses: actions/checkout@v3 @@ -85,7 +85,7 @@ jobs: make -f Makefile test-clevis-loop toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN components: cargo - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT runs-on: ubuntu-22.04 container: image: ${{ matrix.image }} @@ -93,7 +93,7 @@ jobs: services: tang: # yamllint disable rule:line-length - image: ghcr.io/stratis-storage/stratisd/tang:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: ghcr.io/stratis-storage/stratisd/tang:38 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -181,7 +181,7 @@ jobs: stratis-min-cli-checks: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged --userns=host --ipc=host -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1 steps: - uses: actions/checkout@v3 @@ -223,7 +223,7 @@ jobs: shell-checks: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies @@ -238,7 +238,7 @@ jobs: python-based-tests: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7f7d3d8089..15c2ba9f21 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,7 +19,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora @@ -47,7 +47,7 @@ jobs: check_future_dependencies: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora @@ -88,7 +88,7 @@ jobs: components: clippy runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora @@ -124,7 +124,7 @@ jobs: - task: AUDITABLE=1 PROFILEDIR=debug make -f Makefile audit-all-rust runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora @@ -158,7 +158,7 @@ jobs: checks-with-ci-repo: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies for Fedora diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml index fd950b7901..eada198318 100644 --- a/.github/workflows/support.yml +++ b/.github/workflows/support.yml @@ -55,7 +55,7 @@ jobs: task: make -f Makefile yamllint tmtlint working-directory: . runs-on: ubuntu-22.04 - container: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + container: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v3 - name: Install dependencies diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 843a802e2c..b042df560e 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -29,7 +29,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev steps: - uses: actions/checkout@v3 @@ -64,7 +64,7 @@ jobs: components: cargo runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host steps: - uses: actions/checkout@v3 @@ -111,7 +111,7 @@ jobs: make -f Makefile test-clevis-loop-valgrind toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN components: cargo - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT runs-on: ubuntu-22.04 container: image: ${{ matrix.image }} @@ -119,7 +119,7 @@ jobs: services: tang: # yamllint disable rule:line-length - image: ghcr.io/stratis-storage/stratisd/tang:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: ghcr.io/stratis-storage/stratisd/tang:38 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -216,12 +216,12 @@ jobs: python-based-checks_with_tang: runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1 -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev services: tang: # yamllint disable rule:line-length - image: ghcr.io/stratis-storage/stratisd/tang:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: ghcr.io/stratis-storage/stratisd/tang:38 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index bad64b9ce0..e89d87d1a2 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -77,7 +77,7 @@ jobs: - tag: v3.0.0 runs-on: ubuntu-22.04 container: - image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT + image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT options: --privileged -v /dev:/dev steps: - uses: actions/checkout@v3 diff --git a/tests/client-dbus/tests/udev/_loopback.py b/tests/client-dbus/tests/udev/_loopback.py index b05c61f686..94e0a27cca 100644 --- a/tests/client-dbus/tests/udev/_loopback.py +++ b/tests/client-dbus/tests/udev/_loopback.py @@ -207,7 +207,7 @@ def destroy_devices(self): Detach loopbacks and remove backing files :return: """ - for (device, backing_file) in self.devices.values(): + for device, backing_file in self.devices.values(): if device is not None: subprocess.check_call([_LOSETUP_BIN, "-d", device]) os.remove(backing_file) diff --git a/tests/client-dbus/tests/udev/_utils.py b/tests/client-dbus/tests/udev/_utils.py index fed1114d59..88a5067f64 100644 --- a/tests/client-dbus/tests/udev/_utils.py +++ b/tests/client-dbus/tests/udev/_utils.py @@ -326,7 +326,7 @@ def __enter__(self): :raises RuntimeError: if setting a key in the keyring through stratisd fails """ - for (key_desc, key_data) in self._key_descs: + for key_desc, key_data in self._key_descs: with NamedTemporaryFile(mode="w") as temp_file: temp_file.write(key_data) temp_file.flush() @@ -349,7 +349,7 @@ def __enter__(self): def __exit__(self, exception_type, exception_value, traceback): try: - for (key_desc, _) in reversed(self._key_descs): + for key_desc, _ in reversed(self._key_descs): (_, return_code, message) = Manager.Methods.UnsetKey( get_object(TOP_OBJECT), {"key_desc": key_desc} ) diff --git a/tests/client-dbus/tests/udev/test_predict.py b/tests/client-dbus/tests/udev/test_predict.py index 347c7577bd..be8227447a 100644 --- a/tests/client-dbus/tests/udev/test_predict.py +++ b/tests/client-dbus/tests/udev/test_predict.py @@ -117,7 +117,11 @@ def _possibly_add_filesystems(pool_object_path, *, fs_specs=None): if not real: raise RuntimeError("Failed to get pool usage before creating filesystems.") - (_, return_code, message,) = Pool.Methods.CreateFilesystems( + ( + _, + return_code, + message, + ) = Pool.Methods.CreateFilesystems( pool_proxy, {"specs": map(lambda x: (x[0], (True, str(x[1].magnitude))), fs_specs)}, )