Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advance current development environment to Fedora 39 #3510

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Advance current development environment to Fedora 39 #3510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2522ce
Advance current development environment to Fedora 39
bgurney-rh Nov 27, 2023
172308d
Leave tang container as F38
bgurney-rh Nov 27, 2023
19afbdb
Apply formatting changes from black 23.7.0
bgurney-rh Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -85,15 +85,15 @@ 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 }}
options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/valgrind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -111,15 +111,15 @@ 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 }}
options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/client-dbus/tests/udev/_loopback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/client-dbus/tests/udev/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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}
)
Expand Down
6 changes: 5 additions & 1 deletion tests/client-dbus/tests/udev/test_predict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
)
Expand Down