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

Runs fetch-tor-packages with pinned version in CI #4300

Merged
merged 1 commit into from
Apr 1, 2019
Merged

Runs fetch-tor-packages with pinned version in CI #4300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,15 @@ jobs:
- setup_remote_docker
- run: cd admin ; make test

fetch-tor-debs:
docker:
- image: gcr.io/cloud-builders/docker
steps:
- run: apt-get install -y make virtualenv python-pip
- checkout
- setup_remote_docker
- run: make fetch-tor-packages

updater-gui-tests:
docker:
- image: circleci/python:3.5
Expand Down Expand Up @@ -308,6 +317,12 @@ workflows:
ignore:
- /docs-.*/
- /i18n-.*/
- fetch-tor-debs:
filters:
branches:
ignore:
- /docs-.*/
- /i18n-.*/
- updater-gui-tests:
filters:
branches:
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 @@ -203,7 +203,7 @@ upgrade-trusty-test-qa: ## Once an upgrade environment (Trusty) is running, forc

.PHONY: fetch-tor-packages
fetch-tor-packages: ## Retrieves the most recent Tor packages for Xenial, for apt repo
molecule test -s fetch-tor-packages
@./devops/scripts/fetch-tor-packages.sh

# Explaination of the below shell command should it ever break.
# 1. Set the field separator to ": ##" and any make targets that might appear between : and ##
Expand Down
14 changes: 14 additions & 0 deletions devops/scripts/fetch-tor-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
# shellcheck disable=SC2209
#
# Wrapper around debian build logic to bootstrap virtualenv

set -e
set -u
set -o pipefail

. ./devops/scripts/boot-strap-venv.sh

virtualenv_bootstrap

molecule test -s fetch-tor-packages
4 changes: 3 additions & 1 deletion molecule/fetch-tor-packages/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
tor_download_dest: "{{ sd_repo_root + '/build/' + ansible_distribution_release }}"
tor_repo_pubkey: "{{ sd_repo_root + '/install_files/ansible-base/roles/tor-hidden-services/files/tor-signing-key.pub' }}"
tor_repo_url: "deb https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main"
# Used to fetch a precise version; must also be updated in the test vars
tor_version: "0.3.5.8-1~xenial+1"

tasks:
- name: Add Tor apt repo pubkey
Expand All @@ -29,7 +31,7 @@
path: "{{ tor_download_dir }}"

- name: Download tor debs
command: apt-get download "{{ item }}"
command: apt-get download "{{ item }}={{ tor_version }}"
args:
chdir: "{{ tor_download_dir }}"
# apt module doesn't support download, so silence warnings,
Expand Down