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

Run testing repo tests against PR #3545

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Run testing repo tests against PR #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78b992c
Add infrastructure for supporting multiple token slots per unlock method
jbaublitz Sep 30, 2024
f3637df
Modify D-Bus interface to support multiple token slots
jbaublitz Nov 13, 2024
297c3ff
Remove .packit.yaml
mulkieran Dec 3, 2024
824a26f
test
mulkieran Jun 20, 2024
36a36e4
test
mulkieran Jan 17, 2025
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
7 changes: 5 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ jobs:
include:
- rev: HEAD
options: --post-test-check=verify-filesystem-symlinks --post-test-check=verify-pool-metadata --highest-revision-number=8
- rev: v3.6.2
options: --highest-revision-number=6
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -299,6 +297,11 @@ jobs:
- name: Checkout revision ${{ matrix.rev }}
run: git checkout -b new-branch ${{ matrix.rev }}
working-directory: ./testing
- name: Switch
run: |
git checkout -b mulkieran-multiple-token-slots master
git pull https://github.com/mulkieran/testing.git multiple-token-slots
working-directory: ./testing
- name: Run stratisd_cert.py
run: >
sudo
Expand Down
61 changes: 0 additions & 61 deletions .packit.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ version = "0.2.155"
optional = true

[dependencies.libcryptsetup-rs]
version = "0.11.0"
version = "0.11.2"
features = ["mutex"]
optional = true

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ test-stratis-min:

## Run yamllint on workflow files
yamllint:
yamllint --strict .github/workflows/*.yml .packit.yaml
yamllint --strict .github/workflows/*.yml

## Run tmt lint
tmtlint:
Expand Down
9 changes: 2 additions & 7 deletions src/bin/stratis-legacy-pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use serde_json::{json, Map, Value};

use stratisd::{
engine::{
register_clevis_token, EncryptionInfo, KeyDescription, ProcessedPathInfos, StratPool,
register_clevis_token, InputEncryptionInfo, KeyDescription, ProcessedPathInfos, StratPool,
CLEVIS_TANG_TRUST_URL,
},
stratis::StratisResult,
Expand Down Expand Up @@ -120,12 +120,7 @@ fn main() -> StratisResult<()> {
)?
.unpack()
.1;
let encryption_info = match (key_desc, clevis_info) {
(Some(kd), Some(ci)) => Some(EncryptionInfo::Both(kd, ci)),
(Some(kd), _) => Some(EncryptionInfo::KeyDesc(kd)),
(_, Some(ci)) => Some(EncryptionInfo::ClevisInfo(ci)),
(_, _) => None,
};
let encryption_info = InputEncryptionInfo::new_legacy(key_desc, clevis_info);
register_clevis_token()?;
StratPool::initialize(name.as_str(), unowned, encryption_info.as_ref())?;
Ok(())
Expand Down
Loading
Loading