Skip to content

Remove "environment" from config.json#1393

Closed
rocodes wants to merge 11 commits intofeat/sdw-keyring-compatfrom
remove-environment-from-json-config
Closed

Remove "environment" from config.json#1393
rocodes wants to merge 11 commits intofeat/sdw-keyring-compatfrom
remove-environment-from-json-config

Conversation

@rocodes
Copy link
Copy Markdown
Contributor

@rocodes rocodes commented Aug 6, 2025

Stacked PR, depends on #1392

Remove "environment" from config.json . (more tk)

Test plan

  • Visual review
  • 1392 is merged
  • base branch is feat/sdw-keyring-compat not main!
  • CI: last commit has openqa, full CI run passing

Checklist

This change accounts for:

  • any necessary RPM packaging updates (e.g., added/removed files, see MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec)
  • any required documentation

@rocodes rocodes added the keyring label Aug 6, 2025
@rocodes rocodes force-pushed the remove-environment-from-json-config branch 2 times, most recently from 12781d9 to a8b3f41 Compare August 18, 2025 15:52
@rocodes rocodes force-pushed the remove-environment-from-json-config branch 4 times, most recently from 780eee6 to 1cb7e01 Compare August 22, 2025 18:20
…y shipped to dom0 in

/etc/pki from securedrop-workstation-keyring. Key must be cached by dom0 and retrieved by the vm.
Consolidate all apt repo configuration into sd-default-config.sls (delete sd-default-config.yml). Rename sdvars to apt_config for clarity.
…he keyring is used consistently across yum and apt components. Move test_sources functionality out of launcher tests. Deprecate skip_in_dom0 conftest annotation.
@rocodes rocodes force-pushed the remove-environment-from-json-config branch from 1cb7e01 to de36543 Compare August 25, 2025 14:26
@rocodes rocodes force-pushed the remove-environment-from-json-config branch from de36543 to 4bd118c Compare August 25, 2025 15:30
@rocodes rocodes marked this pull request as ready for review August 25, 2025 15:31
@rocodes rocodes requested a review from a team as a code owner August 25, 2025 15:31
…nment via .repo file and installed packages in dom0 tests.

Check environment via .repo files instead of config.json in VM tests.

openqa
@rocodes rocodes force-pushed the remove-environment-from-json-config branch from 4bd118c to 0067dee Compare August 25, 2025 15:37
@rocodes
Copy link
Copy Markdown
Contributor Author

rocodes commented Aug 26, 2025

As with #1392 I'm closing this due to time/capacity crunch. If anyone wants to take it over, I still think it would be a good addition, but it depends on #1392 and that's not complete.

@rocodes rocodes closed this Aug 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant