-
Notifications
You must be signed in to change notification settings - Fork 687
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.
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
Test tor packages from tor-apt-test
in release branches
#2941
Conversation
cb03649
to
e4e12a5
Compare
This is useful for the QA process during a run-up to a release.
Useful for debugging
e4e12a5
to
38fcffe
Compare
Not sure if this will solve an issue I'm seeing in CI 🤷
Codecov Report
@@ Coverage Diff @@
## release/0.5.2 #2941 +/- ##
================================================
Coverage ? 85.52%
================================================
Files ? 31
Lines ? 1914
Branches ? 213
================================================
Hits ? 1637
Misses ? 228
Partials ? 49 Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @msheiny - confirmed that for our staging-test-with-rebase
CI job the .tor_version
artifact is stored and is 0.3.2.9-1~trusty+1
, and that test_tor_mirror_present
is passing in local staging
@@ -9,6 +9,14 @@ | |||
# WHEN REINSTATING REBOOT | |||
- include: reboot_and_wait.yml | |||
when: "false" | |||
- include: tor_apt_test.yml | |||
when: (lookup('env','CIRCLE_BRANCH')|default('na')).startswith('release') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@msheiny Assigning defaults to env lookups often leads to surprises. I believe it's currently not possible to override an undefined env var with |default
, but the lookup will return an empty string, which will satisfies the conditional logic here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohhh shit you are totally right @conorsch - thanks for pointing that out
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Older versions of Ansible threw an uncatchable exception in the event of an undefined env var lookup, so the behavior has improved somewhat, but the silent ignore of |default
warrants careful attention. Still, good to go here. 👌
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Note this will run the apt-test logic only on release*
branches, not on develop. That's fine, just being super clear about the expected changes here.
Conflicts: .circleci/config.yml Favored develop since admin test jobs were added in develop in #2758. install_files/ansible-base/roles/ossec/files/test_admin_key.pub install_files/ansible-base/roles/ossec/files/test_admin_key.sec Favored develop for these changes since these keys in 0.5.2 were erroneously both public keys (fixed in #2925). install_files/ansible-base/securedrop-configure.yml Deleted this file as it was removed in develop during the sdconfig refactor (#2758) from Ansible to Python. The locale prompt additions added in SecureDrop 0.5.2 were added in #2758 on develop. molecule/aws/scripts/app-tests.sh Favored develop since the addition of RTL language testing was added in #2930. molecule/aws/side_effect.yml Favored release/0.5.2 as these changes were due to the addition of Tor apt repo testing in CI against release branches (#2941). securedrop/Dockerfile Favored develop since all these gettext commands being merged into one RUN command was done in #2822 and is still on develop.
Conflicts: .circleci/config.yml Favored develop since admin test jobs were added in develop in #2758. install_files/ansible-base/roles/ossec/files/test_admin_key.pub install_files/ansible-base/roles/ossec/files/test_admin_key.sec Favored develop for these changes since these keys in 0.5.2 were erroneously both public keys (fixed in #2925). install_files/ansible-base/securedrop-configure.yml Deleted this file as it was removed in develop during the sdconfig refactor (#2758) from Ansible to Python. The locale prompt additions added in SecureDrop 0.5.2 were added in #2758 on develop. molecule/aws/scripts/app-tests.sh Favored develop since the addition of RTL language testing was added in #2930. molecule/aws/side_effect.yml Favored release/0.5.2 as these changes were due to the addition of Tor apt repo testing in CI against release branches (#2941). securedrop/Dockerfile Favored develop since all these gettext commands being merged into one RUN command was done in #2822 and is still on develop.
Conflicts: .circleci/config.yml Favored develop since admin test jobs were added in develop in #2758. install_files/ansible-base/roles/ossec/files/test_admin_key.pub install_files/ansible-base/roles/ossec/files/test_admin_key.sec Favored develop for these changes since these keys in 0.5.2 were erroneously both public keys (fixed in #2925). install_files/ansible-base/securedrop-configure.yml Deleted this file as it was removed in develop during the sdconfig refactor (#2758) from Ansible to Python. The locale prompt additions added in SecureDrop 0.5.2 were added in #2758 on develop. molecule/aws/scripts/app-tests.sh Favored develop since the addition of RTL language testing was added in #2930. molecule/aws/side_effect.yml Favored release/0.5.2 as these changes were due to the addition of Tor apt repo testing in CI against release branches (#2941). securedrop/Dockerfile Favored develop since all these gettext commands being merged into one RUN command was done in #2822 and is still on develop. docs/development/contributor_guidelines.rst Favored develop since these contributor guidelines were added recently in #2972.
Conflicts: .circleci/config.yml Favored develop since admin test jobs were added in develop in #2758. install_files/ansible-base/roles/ossec/files/test_admin_key.pub install_files/ansible-base/roles/ossec/files/test_admin_key.sec Favored develop for these changes since these keys in 0.5.2 were erroneously both public keys (fixed in #2925). install_files/ansible-base/securedrop-configure.yml Deleted this file as it was removed in develop during the sdconfig refactor (#2758) from Ansible to Python. The locale prompt additions added in SecureDrop 0.5.2 were added in #2758 on develop. molecule/aws/scripts/app-tests.sh Favored develop since the addition of RTL language testing was added in #2930. molecule/aws/side_effect.yml Favored release/0.5.2 as these changes were due to the addition of Tor apt repo testing in CI against release branches (#2941). securedrop/Dockerfile Favored develop since all these gettext commands being merged into one RUN command was done in #2822 and is still on develop. docs/development/contributor_guidelines.rst Favored develop since these contributor guidelines were added recently in #2972.
Status
Work in progress
Description of Changes
Partially fixes #2919 -- performs testing against CI staging AFTER installing latest tor package in
tor-apt-test.freedom.press
Changes proposed in this pull request:
Ummm what I described right above this part... GEEEZ!!
Testing
How should the reviewer test this PR?
You want to check to make sure CI passed and confirm you are able to see a
.tor_version
artifact in circle CI and it's content matches version0.3.2.9-1~trusty+1
Deployment
Any special considerations for deployment? Consider both:
Well this PR affects CI specfically, but locally for QA you also want to make sure you are installing tor from tor-test-apt.freedom.press
Checklist
If you made changes to the system configuration:
Runing tests locally now, I had to make a tweak to the tor apt test so it doesnt run in the release* branches (same behavior as when this tor apt test is supposed to run).