Skip to content

Commit

Permalink
TEMPORARY: Adds "template-consolidation" component
Browse files Browse the repository at this point in the history
Permits testing from a special channel in the apt-test repo.
Should not be merged into main, useful only for testing.
  • Loading branch information
Conor Schaefer committed Oct 21, 2020
1 parent 205e6ba commit 3728d29
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dom0/fpf-apt-test-repo.sls
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install-python-apt-for-repo-config:

configure-apt-test-apt-repo:
pkgrepo.managed:
- name: "deb [arch=amd64] {{ sdvars.apt_repo_url }} {{ grains['oscodename'] }} main"
- name: "deb [arch=amd64] {{ sdvars.apt_repo_url }} {{ grains['oscodename'] }} {{ sdvars.apt_repo_component }}"
- file: /etc/apt/sources.list.d/securedrop_workstation.list
- key_url: "salt://sd/sd-workstation/{{ sdvars.signing_key_filename }}"
- clean_file: True # squash file to ensure there are no duplicates
Expand Down
2 changes: 2 additions & 0 deletions dom0/sd-default-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ prod:
dom0_yum_repo_url: "https://yum.securedrop.org/workstation/dom0/f25"
apt_repo_url: "https://apt.freedom.press"
signing_key_filename: "securedrop-release-signing-pubkey.asc"
apt_repo_component: main
# Development variables, suited for use during local development
dev:
dom0_yum_repo_url: "https://yum-test.securedrop.org/workstation/dom0/f25"
apt_repo_url: "https://apt-test.freedom.press"
signing_key_filename: "apt-test-pubkey.asc"
apt_repo_component: template-consolidation
4 changes: 3 additions & 1 deletion tests/test_vms_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

apt_url = ""
FPF_APT_SOURCES_STRETCH_DEV = "deb [arch=amd64] https://apt-test.freedom.press stretch main"
FPF_APT_SOURCES_BUSTER_DEV = "deb [arch=amd64] https://apt-test.freedom.press buster main"
FPF_APT_SOURCES_BUSTER_DEV = (
"deb [arch=amd64] https://apt-test.freedom.press buster template-consolidation" # noqa
)
FPF_APT_SOURCES_STRETCH = "deb [arch=amd64] https://apt.freedom.press stretch main"
FPF_APT_SOURCES_BUSTER = "deb [arch=amd64] https://apt.freedom.press buster main"
APT_SOURCES_FILE = "/etc/apt/sources.list.d/securedrop_workstation.list"
Expand Down

0 comments on commit 3728d29

Please sign in to comment.