Closed Bug 1078320 Opened 10 years ago Closed 10 years ago

[14/10/06] Merge latest build/puppet changes into qa/puppet

Categories

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

task
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: whimboo, Assigned: whimboo)

References

Details

There were a dozen of updates to puppet lately including the security fixes for bash and the continuously restarts on OS X. We should merge the latest changes in the build/puppet repository into qa/puppet.

Dustin told me that there could be problems with upgrading puppet on the master. So the following command should temporarily help us:

yum downgrade puppet-3.7.0 puppet-server-3.7.0 && service httpd restart

Dustin, is there something else we would have to obey when getting this onto our production branch?
Flags: needinfo?(dustin)
That's the only major bit that I can remember.
Thanks Dustin! I will let you know if I run into issues.
Flags: needinfo?(dustin)
Assignee: relops → hskupin
Status: NEW → ASSIGNED
After some problems I was able to get the build/puppet changes merged into our default branch. There was no duplicated production head, so I was not forced to close such a head. But while pushing the changes to hg.mo I have seen that I'm forced to push a branch called 'defualts' to our repo. That one was created earlier on the build/puppet repo by accident, and has been closed immediately. But we sadly have to carry it around now.

> $ hg push 
> pushing to ssh://hg.mozilla.org/qa/puppet/
> searching for changes
> abort: push creates new remote branches: defualt!
> (use 'hg push --new-branch' to create new remote branches)

Merge as landed on our default branch:
https://hg.mozilla.org/qa/puppet/rev/5cb2c7539fd5

I will merge it to production tomorrow morning, and will make sure to have an eye on puppetmaster for the downgrade.
I merged all from default into production. I will observe puppetmaster for the above mentioned problems.
All looks fine so far. I will keep this bug open for another merge once bug 1078882 for OS X 10.10 support has been fixed.
Depends on: 1078882
Merged latest changes with 10.10 support into our repo:

https://hg.mozilla.org/qa/puppet/rev/0d96c2883edb (default)
https://hg.mozilla.org/qa/puppet/rev/2921c8613150 (production)

I consider this bug as done now.
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Summary: Merge latest build/puppet changes into qa/puppet → [14/10/06] Merge latest build/puppet changes into qa/puppet
You need to log in before you can comment on or make changes to this bug.