1066266 - Deal with untracked files in the git repos on staging/production

Status: RESOLVED FIXED

(Tree Management :: Treeherder: Infrastructure, defect, P3)

Description

[Ed Morley [:emorley]]

There are untracked files in the repo on dev. 

We should probably:
1) Delete any files that are no longer needed
2) Commit files that are required and not private/a local config file into the repo
3) Add anything left to .gitignore

We should probably check staging and prod too.

Comment 1

[Ed Morley [:emorley]]

[root@dev-3 treeherder-ui]# git status
# On branch master
nothing to commit, working directory clean

[root@dev-3 treeherder-service]# git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       apache.conf.temp
#       auth_init_data.json
#       gunicorn.conf.py
#       puppet/manifests/aws.pp
#       taskcluster_jobs.sql
#       taskcluster_objectstore.sql
nothing added to commit but untracked files present (use "git add" to track)

And in the containing folder for the two repos there is:

[root@dev-3 treeherder]# cat update-to-master.sh
#!/bin/bash

set -v
cd treeherder-service
git checkout master
git pull
python setup.py build_ext --inplace
cd ../treeherder-ui
git checkout master
git pull
set -x

Comment 2

[Ed Morley [:emorley]]

th-prod-admin:

[[e-mail]3 treeherder-service]$ git status -s
?? deployment/update/commander_settings.py
?? test.output
?? treeherder/webapp/media/revision

th-stage:

(venv)[treeherder@stage-1 treeherder-service]$ git status -s
?? cedar.sql
?? puppet/manifests/aws.pp
?? treeherder.dump

(venv)[treeherder@stage-1 treeherder-ui]$ git status -s
 D dist/css/help.min-7526d0de1c249ac993c3e0a7eaa96e95.css
 D dist/css/index.min-b214ba1251e2e84bf2a9ada9ab17f307.css
 D dist/css/logviewer.min-f5f469d307dd934f10bc9f08846d4d7e.css
 M dist/help.html
 M dist/index.html
 D dist/js/index.min-2a422696e51a7937ffd18d4a2522717f.js
 D dist/js/logviewer.min-9cc603b1f295c87ff769f9f7b7b4a872.js
 M dist/logviewer.html
 D dist/partials/jobs.html
 D dist/partials/lvLogLines.html
 D dist/partials/lvLogSteps.html
 D dist/partials/machines.html
 D dist/partials/persona_buttons.html
 D dist/partials/revisionListModal.html
 D dist/partials/thActionButton.html
 D dist/partials/thFilterCheckbox.html
 D dist/partials/thFilterPanel.html
 D dist/partials/thGlobalTopNavPanel.html
 D dist/partials/thMultiSelect.html
 D dist/partials/thNotificationsBox.html
 D dist/partials/thPinboardPanel.html
 D dist/partials/thPinnedJob.html
 D dist/partials/thRelatedBugQueued.html
 D dist/partials/thRelatedBugSaved.html
 D dist/partials/thRepoDropDown.html
 D dist/partials/thResultCounts.html
 D dist/partials/thResultStatusCount.html
 D dist/partials/thRevision.html
 D dist/partials/thSettingsPanel.html
 D dist/partials/thSheriffPanel.html
 D dist/partials/thStar.html
 D dist/partials/thWatchedRepo.html
 D dist/partials/thWatchedRepoNavPanel.html
 D dist/partials/timeline.html
 D dist/plugins/annotations/main.html
 D dist/plugins/failure_summary/main.html
 D dist/plugins/pluginpanel.html
 D dist/plugins/similar_jobs/main.html

Comment 3

[Ed Morley [:emorley]]

Latest...

Dev - treeherder-service:

?? apache.conf.temp
?? auth_init_data.json
?? gunicorn.conf.py
?? puppet/manifests/aws.pp
?? taskcluster_jobs.sql
?? taskcluster_objectstore.sql

Stage - treeherder-service:
?? cedar.sql
?? puppet/manifests/aws.pp
?? treeherder.dump

Stage - treeherder-ui:
 D dist/css/help.min-6163e7176d35e7994ef5cde84e24fc08.css
 D dist/css/index.min-e36063d0387e2becb3506315d4e47075.css
 D dist/css/logviewer.min-fce663975014f913860acf5748ea7933.css
 M dist/fonts/glyphicons-halflings-regular.eot
 M dist/fonts/glyphicons-halflings-regular.svg
 M dist/fonts/glyphicons-halflings-regular.ttf
 M dist/fonts/glyphicons-halflings-regular.woff
 M dist/help.html
 M dist/index.html
 D dist/js/index.min-5838d3a435e41e9bd9838e5f1d2a4073.js
 D dist/js/logviewer.min-51e740ecb0661f371c6450fceb9fb1f4.js
 M dist/logviewer.html

Prod - treeherder-service:
?? apache.conf.temp
?? auth_init_data.json
?? gunicorn.conf.py
?? puppet/manifests/aws.pp
?? taskcluster_jobs.sql
?? taskcluster_objectstore.sql

Comment 4

[Ed Morley [:emorley]]

> ?? gunicorn.conf.py

The file doesn't appear to contain any credentials, so we should either check this is (if it's identical on both dev & prod) or else check in an example and add this one to .gitignore. Strangely it's present on dev/prod but not stage.

> ?? puppet/manifests/aws.pp

This file currently contains credentials, we should extract those out and check the file in. We should have all logic (and sample credential templates) checked into the repo and not in untracked files.

> ?? taskcluster_jobs.sql
> ?? taskcluster_objectstore.sql
> ?? cedar.sql
> ?? treeherder.dump

I would imagine these were for debugging and can now be deleted?

> ?? apache.conf.temp
> ?? auth_init_data.json

Adding to .gitignore?


> Stage - treeherder-ui:
>  D dist/css/help.min-6163e7176d35e7994ef5cde84e24fc08.css
>  D dist/css/index.min-e36063d0387e2becb3506315d4e47075.css
>  D dist/css/logviewer.min-fce663975014f913860acf5748ea7933.css
>  M dist/fonts/glyphicons-halflings-regular.eot
>  M dist/fonts/glyphicons-halflings-regular.svg
>  M dist/fonts/glyphicons-halflings-regular.ttf
>  M dist/fonts/glyphicons-halflings-regular.woff
>  M dist/help.html
>  M dist/index.html
>  D dist/js/index.min-5838d3a435e41e9bd9838e5f1d2a4073.js
>  D dist/js/logviewer.min-51e740ecb0661f371c6450fceb9fb1f4.js
>  M dist/logviewer.html

I'm not sure why the dist directory is modified on stage, unless someone is running grunt build directly there rather than checking it into the repo and deploying the updating repo on stage?

jeads/mdoglio/camd, any ideas as to this last one?

Comment 5

[Ed Morley [:emorley]]

I've removed:
[th-admin] /data/treeherder/src/treeherder.mozilla.org/treeherder-service/test.output

Additions required to treeherder-service .gitignore:
deployment/update/commander_settings.py
treeherder/webapp/media/revision

Apart from that, there are no other untracked files in the repo (I'm going to ignore dev for now, since we don't really use it much any more).

Comment 6

[Ed Morley [:emorley]]

Attachment: Add some stage/prod specific files to gitignore

Comment 7

[Treeherder GitHub Bugbot]

Commit pushed to master at https://github.com/mozilla/treeherder-service

https://github.com/mozilla/treeherder-service/commit/21328551fae212fc04ca276df42b8a561c0c4e05
Bug 1066266 - Add some stage/prod specific files to gitignore

To ignore:
deployment/update/commander_settings.py
treeherder/webapp/media/revision