Page MenuHomePhabricator

scap deploy-local should make fewer assumptions about server/directories
Open, LowPublic

Description

Currently scap's deploy-local command uses the following syntax:

scap deploy-local --repo [repo-name]

This means that scap relies on /etc/scap.cfg for the following information:

  • git_deploy_dir - This is currently /srv/deployment for all repos and is unlikely to change, but would be nice not to hard-code
  • git_server - This is a value that is filled in by puppet, currently deployment.eqiad.wmnet. Again, this is unlikely to change, but it would be nice not to rely on /etc/scap.cfg for these values.

This syntax comes from trebuchet's. Since the git_deploy_dir and the git_server can be set per-repo, we should change the deploy-local invocation syntax before it surprises anyone.

Details

Related Changes in Gerrit:

Revisions and Commits

Event Timeline

thcipriani triaged this task as High priority.
thcipriani moved this task from Needs triage to Debt on the Scap board.

Current plan:

scap deploy-local [repo-path] [local-checkout-path]

This makes scap look more like git clone.

Example invocation:

scap deploy-local https://tin.eqiad.wmnet/test/testrepo /srv/deployment/test/testrepo

This is a trivial change to make in scap. There are a few puppet changes that will also need to happen that may be a bit trickier.

thcipriani added a revision: Restricted Differential Revision.Oct 2 2016, 4:56 PM

Change 315139 had a related patch set uploaded (by Thcipriani):
Scap: modify deploy-local arguments

https://gerrit.wikimedia.org/r/315139

thcipriani lowered the priority of this task from High to Low.Feb 10 2017, 6:12 PM

Have to figure out a way to deploy this cleanly and haven't done that yet. Lowering priority since it's been taking a back-seat to other scap things.

This is definitely something that is on the back burner but would be nice to have

in 2023 we still have 'tin.eqiad.wmnet' configured as git_server on brandnew machines. This blocks first deploys and keeps coming back all the time.

root@miscweb1003:/srv/deployment/iegreview# grep git_server iegreview-cache/.config 
git_server: tin.eqiad.wmnet