Page MenuHomePhabricator

deployment-prep (Beta)'s operation/puppet is outdated
Closed, ResolvedPublic

Description

To test, we use Beta and deployment-prep's operation puppet repo is more than one week old now. I thought resetting to HEAD is okay, but it is not actually updating.

Beta: a17af5dc5e2de710e764fba5d5b6bb1ddca48b86
operation/puppet's HEAD is: 3dc683347c6c24e77cd8e086b54587ba19182c71

Event Timeline

KartikMistry raised the priority of this task from to Needs Triage.
KartikMistry updated the task description. (Show Details)
KartikMistry added subscribers: KartikMistry, greg, hashar.

Beta puppetmaster is deployment-salt.eqiad.wmflabs the git repo under /var/lib/git/operations/puppet is magically auto rebased via a cronjob.

The working copy is detached and has two commits by @demon and @Joe:

* a17af5d  - (HEAD) dsh: remove unpooled codfw hosts (9 days ago) <Giuseppe Lavagetto>
* 10ab3ee  - Hiera-ize the Elasticsearch config (9 days ago) <Chad Horohoe>

Which are:

https://gerrit.wikimedia.org/r/#/c/200867/ (merged)
https://gerrit.wikimedia.org/r/#/c/197533/ (merged)

I fixed the working copy by discarding them:

git remote update
git checkout production
git rebase --abort  # clean some bad state
git reset --hard origin/production

I guess one of the two patches was being polished up on beta.

hashar claimed this task.
hashar triaged this task as Medium priority.
hashar set Security to None.

Beta puppetmaster is deployment-salt.eqiad.wmflabs the git repo under /var/lib/git/operations/puppet is magically auto rebased via a cronjob.

The working copy is detached and has two commits by @demon and @Joe:

Given we have it rebase how'd the detachness happen? I thought we had an alert that complained when things on the Beta Cluster puppetmaster had unmerged commits for more than a day (@yuvipanda)?