Closed Bug 1380535 Opened 9 years ago Closed 9 years ago

Merge puppet repo into puppet-relabs repo

Categories

(Infrastructure & Operations :: RelOps: Puppet, task)

task
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: dividehex, Assigned: dhouse)

Details

Attachments

(2 files)

We have a testing puppet environment that would be a great place to test doing a root CA cert change on. It has been neglected for sometime now and really needs to have the default production repo merged into it. The last merge was almost 2 years ago: 7e5f13c4da20 2015-07-16 14:41 -0400 Dustin J. Mitchell - merge from moco https://hg.mozilla.org/build/relabs-puppet
Status: NEW → ASSIGNED
Reassigning to Dave, with a note to also make sure the process is documented
Assignee: dcrisan → dhouse
Local merging following the process at https://wiki.mozilla.org/ReleaseEngineering/PuppetAgain/HowTo/Merge_Changes_Between_Repos ended with no conflicts. I'll wait to push it after testing with the relabs puppet master.
Relabs config had some old admin users hardcoded. They needed to be removed before relabs would run on the current relabs-puppet. So I'm doing that as well as merging in the releng-puppet. I have not tested to find if other config or node changes are needed after the merge. However, it looks like I don't have access to push to relabs: ``` pushing to https://hg.mozilla.org/build/relabs-puppet searching for changes abort: authorization failed ```
(In reply to Dave House [:dhouse] from comment #3) > > However, it looks like I don't have access to push to relabs: > pushing to https://hg.mozilla.org/build/relabs-puppet .............^^^^^ gotta add this to your hgrc after cloning: default-push = ssh://hg.mozilla.org/build/relabs-puppet/
Thank you Kendall! I get a permission denied failure when I've added the ssh default-push: ``` $ hg push -r default pushing to ssh://hg.mozilla.org/build/relabs-puppet remote: Permission denied (publickey). abort: no suitable response from remote hg! ``` I tried will all my past mozilla keys and got the same failure. Is there a config or permissions change I can make on the repo to add me?
Flags: needinfo?(klibby)
hgssh4.dmz.scl3# grep dhouse /var/log/secure Jul 31 13:45:44 hgssh4.dmz.scl3.mozilla.com sshd[31500]: User dhouse not allowed because account is locked Jul 31 13:45:44 hgssh4.dmz.scl3.mozilla.com sshd[31500]: input_userauth_request: invalid user dhouse [preauth] That should be dhouse@mozilla.com, so check your .ssh/config (though I'd have assumed that was already set up correctly for pushing to build/puppet)? Should have the following: Host hg.mozilla.org User dhouse@mozilla.com Next step (and this applies to any issues pushing/connecting to hg.mozilla.org) is to run 'ssh -vv hg.mozilla.org'. Ideally, you'll see something along the lines of: --- A SSH connection has been successfully established. Your account (klibby@mozilla.com) has privileges to access Mercurial over SSH. You are a member of the following LDAP groups that govern source control access: scm_level_1, scm_level_2, scm_versioncontrol This will give you write access to the following repos: Project Repos (projects/), Try, User Repos (users/) You will NOT have write access to the following repos: Autoland (integration/autoland), Firefox Repos (mozilla-central, releases/*), Localization Repos (releases/l10n/*, others) You did not specify a command to run on the server. This server only supports running specific commands. Since there is nothing to do, you are being disconnected. --- But if not, you can see which key it's using on your side and then go look through hgssh4:/var/log/secure for errors. You can also run '/usr/local/bin/ldap-lookup-ssh-key dhouse@mozilla.com' to see which keys hg is finding in LDAP and see if there's a mismatch with what your client is using.
Flags: needinfo?(klibby)
I've updated the build/relabs-puppet repo with a merge from build/puppet. I was not able to push with additional (closed) heads because of the hg hook (default on all repos) preventing additional heads. However, I was able to merge the production branches to prevent an orphaned head and end up with updated default and production branches. This preserved history and avoids closing heads.
Dragos, I've updated the relabs-puppet repo with the build/puppet changes. The attached patch has the diff for what I fixed and kept from relabs in the merge.
Attachment #8897107 - Flags: review?(dcrisan)
Attached file relabs_update.log —
Comment on attachment 8897107 [details] [diff] [review] bug1380535_relabs-update.patch LGTM
Attachment #8897107 - Flags: review?(dcrisan) → review+
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: