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.

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

Fix failure tracker #742

Merged
merged 2 commits into from Nov 3, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -9,13 +9,18 @@ intermittent-failure-tracker:
- venv_bin: virtualenv-3.5
- python: python3
- system_site_packages: False
- pip_pkgs:
# This package is required to install the non-code resources that are present
# in the tracker package's git repository.
- setuptools-git
- require:
- pkg: python3
- pip: virtualenv
pip.installed:
- pkgs:
- git+https://github.com/servo/intermittent-failure-tracker@{{ tracker.rev }}
- bin_env: /home/servo/intermittent-failure-tracker/_venv
- upgrade: True
- require:
- virtualenv: intermittent-failure-tracker
{% if grains.get('virtual_subtype', '') != 'Docker' %}
@@ -37,6 +42,12 @@ intermittent-failure-tracker:
- group: servo
- mode: 644
/home/servo/intermittent-failure-tracker/intermittent_errors.json:

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Oct 26, 2017

Member

Why do we need to create this file ourselves? Seems like something the package should create on-demand.

This comment has been minimized.

Copy link
@jdm

jdm Oct 26, 2017

Author Member

The current working directory is not owned by the user that is running the server, so it can't.

file.managed:
- user: servo
- group: servo
- mode: 644
/etc/init/failure-tracker.conf:
file.managed:
- source: salt://{{ tpldir }}/files/tracker.conf
@@ -46,3 +57,4 @@ intermittent-failure-tracker:
- require:
- pip: intermittent-failure-tracker
- file: /home/servo/intermittent-failure-tracker/config.json
- file: /home/servo/intermittent-failure-tracker/intermittent_errors.json
@@ -1,5 +1,5 @@
{%
set tracker = {
'rev': '37ef73bb0059e0555a903e758dae8006c46a9916'
'rev': 'f2f3825b6b026b54769a995ae8a526b2d81ee5fd'

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Oct 26, 2017

Member

It would be nice to publish all these packages to PyPI as well, as our Salt version does better with that than git installs.

This comment has been minimized.

Copy link
@jdm

jdm Oct 26, 2017

Author Member

Better in what sense?

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Oct 26, 2017

Member

#593 is what I'm aware of; this may have been fixed or improved since then but at least in our old Salt the git installs seem less well supported.

This comment has been minimized.

Copy link
@jdm

jdm Oct 26, 2017

Author Member

Per my latest comment in that issue, a2934d0 is all that is necessary. I would rather not go through the effort of publishing these packages.

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Oct 26, 2017

Member

Thanks for updating that issue, since it seems to be working then git dependencies are fine by me.

}
%}
@@ -21,6 +21,7 @@ intermittent-tracker:
- pkgs:
- git+https://github.com/servo/intermittent-tracker@{{ tracker.rev }}
- bin_env: /home/servo/intermittent-tracker/_venv
- upgrade: True
- require:
- virtualenv: intermittent-tracker
{% if grains.get('virtual_subtype', '') != 'Docker' %}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.