If I don't appear to do this within the week please give this ticket a poke! :)

What blocks these from being on the normal puppet master?

The builder instances use:
https://github.com/wmde/puppet-builder
The jenkins instances use:
https://github.com/wmde/puppet-composer
(also has class ci::slave::labs applied)

See docs at https://wikitech.wikimedia.org/wiki/Nova_Resource:Wikidata-build

Simply pulling everything else from master shouldn't be an issue,everything custom we use are in these pretty modules that don't really rely on other things!

Those puppet failures after trying with an updated operations/puppet.git ( see https://bugzilla.wikimedia.org/show_bug.cgi?id=71419#c3 for the error ) on wikidata-builder3.eqiad.wmflabs are now solved. The problem was probably that old package versions of puppet and puppetmaster were not working well with the current puppet code.

Solved this by removing manifests/role/mariadb.pp and manifests/role/phabricator.pp . Then after a half working run it failed after puppet changed /etc/puppet/auth.conf . Tweaking that file made the next run go through. After a few more runs there was no change anymore. Then did an apt-get upgrade and another two puppet runs.

Perhaps first doing an apt-get upgrade and only after that running puppet with the updated repo will work better?

(Warning!: During apt-get upgrade the ldap config will become incorrect which would mean not being able to log in anymore until it gets corrected by running puppet, so take care.)

All updated now.

And https://wikitech.wikimedia.org/wiki/Ldap_rename#Instances_in_Danger has been updated. Thank you Jan!